nfsd4: permit layoutget of executable-only files

[ Upstream commit 66282ec1cf004c09083c29cb5e49019037937bbd ]

Clients must be able to read a file in order to execute it, and for pNFS
that means the client needs to be able to perform a LAYOUTGET on the file.

This behavior for executable-only files was added for OPEN in commit
a043226bc140 "nfsd4: permit read opens of executable-only files".

This fixes up xfstests generic/126 on block/scsi layouts.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 8487486ec4963efb72477e7cf2f19616108f12f2..8ce60986fb750bc9dad37122208ba65b6c8f2caf 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1372,14 +1372,14 @@ nfsd4_layoutget(struct svc_rqst *rqstp,
        const struct nfsd4_layout_ops *ops;
        struct nfs4_layout_stateid *ls;
        __be32 nfserr;
-       int accmode;
+       int accmode = NFSD_MAY_READ_IF_EXEC;
 
        switch (lgp->lg_seg.iomode) {
        case IOMODE_READ:
-               accmode = NFSD_MAY_READ;
+               accmode |= NFSD_MAY_READ;
                break;
        case IOMODE_RW:
-               accmode = NFSD_MAY_READ | NFSD_MAY_WRITE;
+               accmode |= NFSD_MAY_READ | NFSD_MAY_WRITE;
                break;
        default:
                dprintk("%s: invalid iomode %d\n",