Merge remote-tracking branches 'spi/topic/adi-v3', 'spi/topic/atmel', 'spi/topic...

[karo-tx-linux.git] / fs / nfsd / nfs3acl.c

diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
index adc5f1b1dc2677eda3eae5ee895e6df915d4f5cd..2a514e21dc740d93de94052c406d9aaa5d057ff0 100644 (file)
--- a/fs/nfsd/nfs3acl.c
+++ b/fs/nfsd/nfs3acl.c
@@ -128,7 +128,8 @@ out:
 static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p,
                struct nfsd3_getaclargs *args)
 {
-       if (!(p = nfs3svc_decode_fh(p, &args->fh)))
+       p = nfs3svc_decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        args->mask = ntohl(*p); p++;
 
@@ -143,7 +144,8 @@ static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p,
        unsigned int base;
        int n;
 
-       if (!(p = nfs3svc_decode_fh(p, &args->fh)))
+       p = nfs3svc_decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        args->mask = ntohl(*p++);
        if (args->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT) ||