nfsd: Add macro NFS_ACL_MASK for ACL

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index d54701f6dc78..1580ea6fd64d 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -44,13 +44,13 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp,
 
         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;
 
         nfserr = fh_getattr(fh, &resp->stat);
         if (nfserr)
-                goto fail;
+                RETURN_STATUS(nfserr);
 
         if (resp->mask & (NFS_ACL|NFS_ACLCNT)) {
                 acl = get_acl(inode, ACL_TYPE_ACCESS);
@@ -202,7 +202,7 @@ static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p,
         if (!p)
                 return 0;
         argp->mask = ntohl(*p++);
-        if (argp->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT) ||
+        if (argp->mask & ~NFS_ACL_MASK ||
             !xdr_argsize_check(rqstp, p))
                 return 0;
 
@@ -293,9 +293,7 @@ static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p,
                                   resp->acl_default,
                                   resp->mask & NFS_DFACL,
                                   NFS_ACL_DEFAULT);
-        if (n <= 0)
-                return 0;
-        return 1;
+        return (n > 0);
 }
 
 static int nfsaclsvc_encode_attrstatres(struct svc_rqst *rqstp, __be32 *p,