Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeed4cf8 authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Greg Kroah-Hartman
Browse files

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
a043226b "nfsd4: permit read opens of executable-only files".

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

Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64d5c600

fs/nfsd/nfs4proc.c

+3 −3
Original line number Diff line number Diff line
@@ -1338,14 +1338,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",