Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37413077 authored by Benny Halevy's avatar Benny Halevy Committed by Trond Myklebust
Browse files

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: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent aadf6152

fs/nfs/nfs4xdr.c

+0 −6
Original line number Diff line number Diff line
@@ -4423,8 +4423,6 @@ static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, __be32 *p, struct nfs_fsinf 
		status = decode_putfh(&xdr);

	if (!status)

		status = decode_fsinfo(&xdr, fsinfo);

	if (!status)

		status = nfs4_stat_to_errno(hdr.status);

	return status;

}
@@ -4513,8 +4511,6 @@ static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, __be32 *p, 
	status = decode_compound_hdr(&xdr, &hdr);

	if (!status)

		status = decode_setclientid(&xdr, clp);

	if (!status)

		status = nfs4_stat_to_errno(hdr.status);

	return status;

}
@@ -4535,8 +4531,6 @@ static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req, __be32 *p, str 
		status = decode_putrootfh(&xdr);

	if (!status)

		status = decode_fsinfo(&xdr, fsinfo);

	if (!status)

		status = nfs4_stat_to_errno(hdr.status);

	return status;

}