Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

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

diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index de6e39e12cb3e4655ab2017cda8bea11383335ed..e6c01e80325ef147021a085185334ce9c0c56654 100644 (file)
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -278,7 +278,8 @@ void fill_post_wcc(struct svc_fh *fhp)
 int
 nfs3svc_decode_fhandle(struct svc_rqst *rqstp, __be32 *p, struct nfsd_fhandle *args)
 {
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        return xdr_argsize_check(rqstp, p);
 }
@@ -287,7 +288,8 @@ int
 nfs3svc_decode_sattrargs(struct svc_rqst *rqstp, __be32 *p,
                                        struct nfsd3_sattrargs *args)
 {
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        p = decode_sattr3(p, &args->attrs);
 
@@ -315,7 +317,8 @@ int
 nfs3svc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p,
                                        struct nfsd3_accessargs *args)
 {
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        args->access = ntohl(*p++);
 
@@ -330,7 +333,8 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p,
        int v;
        u32 max_blocksize = svc_max_payload(rqstp);
 
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        p = xdr_decode_hyper(p, &args->offset);
 
@@ -360,7 +364,8 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p,
        unsigned int len, v, hdr, dlen;
        u32 max_blocksize = svc_max_payload(rqstp);
 
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        p = xdr_decode_hyper(p, &args->offset);
 
@@ -535,7 +540,8 @@ int
 nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p,
                                        struct nfsd3_readlinkargs *args)
 {
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        args->buffer = page_address(*(rqstp->rq_next_page++));
 
@@ -558,7 +564,8 @@ int
 nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p,
                                        struct nfsd3_readdirargs *args)
 {
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        p = xdr_decode_hyper(p, &args->cookie);
        args->verf   = p; p += 2;
@@ -580,7 +587,8 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p,
        int len;
        u32 max_blocksize = svc_max_payload(rqstp);
 
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        p = xdr_decode_hyper(p, &args->cookie);
        args->verf     = p; p += 2;
@@ -605,7 +613,8 @@ int
 nfs3svc_decode_commitargs(struct svc_rqst *rqstp, __be32 *p,
                                        struct nfsd3_commitargs *args)
 {
-       if (!(p = decode_fh(p, &args->fh)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
        p = xdr_decode_hyper(p, &args->offset);
        args->count = ntohl(*p++);