]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
NFS: return error from decode_getfh in decode open
authorWeston Andros Adamson <dros@netapp.com>
Thu, 6 Sep 2012 19:54:27 +0000 (15:54 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 6 Sep 2012 20:01:33 +0000 (16:01 -0400)
If decode_getfh failed, nfs4_xdr_dec_open would return 0 since the last
decode_* call must have succeeded.

Cc: stable@vger.kernel.org
Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/nfs4xdr.c

index 541e796e6db58f3ae3e17fa9e1a478860dc169b2..8dba6bd485578695fb791f8aa548bc8ac99b4391 100644 (file)
@@ -6225,7 +6225,8 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
        status = decode_open(xdr, res);
        if (status)
                goto out;
-       if (decode_getfh(xdr, &res->fh) != 0)
+       status = decode_getfh(xdr, &res->fh);
+       if (status)
                goto out;
        decode_getfattr(xdr, res->f_attr, res->server);
 out: