aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2008-12-23 16:06:14 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-12-23 16:06:14 -0500
commit374130770efc80418b155b2966ff958495e03948 (patch)
treeca6f284a742ee1c6165beb10ca19cd919596bcee
parentaadf61521199e5c0b2976002213819cafa41b897 (diff)
nfs: remove incorrect usage of nfs4 compound response hdr.status
3 call sites look at hdr.status before returning success. hdr.status must be zero in this case so there's no point in this. Currently, hdr.status is correctly processed at decode_op_hdr time if the op status cannot be decoded. Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4xdr.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 3f18a266a491..7eeed0ed5898 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -4423,8 +4423,6 @@ static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, __be32 *p, struct nfs_fsinf
4423 status = decode_putfh(&xdr); 4423 status = decode_putfh(&xdr);
4424 if (!status) 4424 if (!status)
4425 status = decode_fsinfo(&xdr, fsinfo); 4425 status = decode_fsinfo(&xdr, fsinfo);
4426 if (!status)
4427 status = nfs4_stat_to_errno(hdr.status);
4428 return status; 4426 return status;
4429} 4427}
4430 4428
@@ -4513,8 +4511,6 @@ static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, __be32 *p,
4513 status = decode_compound_hdr(&xdr, &hdr); 4511 status = decode_compound_hdr(&xdr, &hdr);
4514 if (!status) 4512 if (!status)
4515 status = decode_setclientid(&xdr, clp); 4513 status = decode_setclientid(&xdr, clp);
4516 if (!status)
4517 status = nfs4_stat_to_errno(hdr.status);
4518 return status; 4514 return status;
4519} 4515}
4520 4516
@@ -4535,8 +4531,6 @@ static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req, __be32 *p, str
4535 status = decode_putrootfh(&xdr); 4531 status = decode_putrootfh(&xdr);
4536 if (!status) 4532 if (!status)
4537 status = decode_fsinfo(&xdr, fsinfo); 4533 status = decode_fsinfo(&xdr, fsinfo);
4538 if (!status)
4539 status = nfs4_stat_to_errno(hdr.status);
4540 return status; 4534 return status;
4541} 4535}
4542 4536