nfsd4: permit layoutget of executable-only files

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
a043226bc1 "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>
This commit is contained in:
Benjamin Coddington 2017-12-19 09:35:25 -05:00 коммит произвёл J. Bruce Fields
Родитель d9226ec9ef
Коммит 66282ec1cf
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -1363,14 +1363,14 @@ nfsd4_layoutget(struct svc_rqst *rqstp,
const struct nfsd4_layout_ops *ops; const struct nfsd4_layout_ops *ops;
struct nfs4_layout_stateid *ls; struct nfs4_layout_stateid *ls;
__be32 nfserr; __be32 nfserr;
int accmode; int accmode = NFSD_MAY_READ_IF_EXEC;
switch (lgp->lg_seg.iomode) { switch (lgp->lg_seg.iomode) {
case IOMODE_READ: case IOMODE_READ:
accmode = NFSD_MAY_READ; accmode |= NFSD_MAY_READ;
break; break;
case IOMODE_RW: case IOMODE_RW:
accmode = NFSD_MAY_READ | NFSD_MAY_WRITE; accmode |= NFSD_MAY_READ | NFSD_MAY_WRITE;
break; break;
default: default:
dprintk("%s: invalid iomode %d\n", dprintk("%s: invalid iomode %d\n",