projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[firefly-linux-kernel-4.4.55.git]
/
fs
/
nfsd
/
nfs3acl.c
diff --git
a/fs/nfsd/nfs3acl.c
b/fs/nfsd/nfs3acl.c
index 882b1a14bc3e85961fbd628009c7618b13263a88..01df4cd7c753fe12cee4c6d37a5ba9400b6f8f41 100644
(file)
--- a/
fs/nfsd/nfs3acl.c
+++ b/
fs/nfsd/nfs3acl.c
@@
-41,7
+41,7
@@
static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp,
inode = d_inode(fh->fh_dentry);
inode = d_inode(fh->fh_dentry);
- if (argp->mask & ~
(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT)
)
+ if (argp->mask & ~
NFS_ACL_MASK
)
RETURN_STATUS(nfserr_inval);
resp->mask = argp->mask;
RETURN_STATUS(nfserr_inval);
resp->mask = argp->mask;
@@
-148,7
+148,7
@@
static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p,
if (!p)
return 0;
args->mask = ntohl(*p++);
if (!p)
return 0;
args->mask = ntohl(*p++);
- if (args->mask & ~
(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT)
||
+ if (args->mask & ~
NFS_ACL_MASK
||
!xdr_argsize_check(rqstp, p))
return 0;
!xdr_argsize_check(rqstp, p))
return 0;