diff options
Diffstat (limited to 'fs/nfsd/nfs2acl.c')
-rw-r--r-- | fs/nfsd/nfs2acl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c index 1c3b7654e966..4e3219e84116 100644 --- a/fs/nfsd/nfs2acl.c +++ b/fs/nfsd/nfs2acl.c | |||
@@ -40,7 +40,8 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, | |||
40 | dprintk("nfsd: GETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); | 40 | dprintk("nfsd: GETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); |
41 | 41 | ||
42 | fh = fh_copy(&resp->fh, &argp->fh); | 42 | fh = fh_copy(&resp->fh, &argp->fh); |
43 | if ((nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP))) | 43 | nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP); |
44 | if (nfserr) | ||
44 | RETURN_STATUS(nfserr); | 45 | RETURN_STATUS(nfserr); |
45 | 46 | ||
46 | if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT)) | 47 | if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT)) |
@@ -107,7 +108,7 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp, | |||
107 | dprintk("nfsd: SETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); | 108 | dprintk("nfsd: SETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); |
108 | 109 | ||
109 | fh = fh_copy(&resp->fh, &argp->fh); | 110 | fh = fh_copy(&resp->fh, &argp->fh); |
110 | nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR); | 111 | nfserr = fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_SATTR); |
111 | 112 | ||
112 | if (!nfserr) { | 113 | if (!nfserr) { |
113 | nfserr = nfserrno( nfsd_set_posix_acl( | 114 | nfserr = nfserrno( nfsd_set_posix_acl( |
@@ -134,7 +135,7 @@ static __be32 nfsacld_proc_getattr(struct svc_rqst * rqstp, | |||
134 | dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); | 135 | dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); |
135 | 136 | ||
136 | fh_copy(&resp->fh, &argp->fh); | 137 | fh_copy(&resp->fh, &argp->fh); |
137 | return fh_verify(rqstp, &resp->fh, 0, MAY_NOP); | 138 | return fh_verify(rqstp, &resp->fh, 0, NFSD_MAY_NOP); |
138 | } | 139 | } |
139 | 140 | ||
140 | /* | 141 | /* |