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

Commit 0af3f814 authored by Benny Halevy's avatar Benny Halevy Committed by J. Bruce Fields
Browse files

NFSD: use nfserr for status after decode_cb_op_status 



Bugs introduced in 85a56480
"NFSD: Update XDR decoders in NFSv4 callback client"

Cc: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 541ce98c

fs/nfsd/nfs4callback.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -484,7 +484,7 @@ static int decode_cb_sequence4res(struct xdr_stream *xdr, 
out:

out:

	return status;

	return status;

out_default:

out_default:

	return nfs_cb_stat_to_errno(status);

	return nfs_cb_stat_to_errno(nfserr);

}

}





/*

/*
@@ -564,11 +564,9 @@ static int nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, 
	if (unlikely(status))

	if (unlikely(status))

		goto out;

		goto out;

	if (unlikely(nfserr != NFS4_OK))

	if (unlikely(nfserr != NFS4_OK))

		goto out_default;

		status = nfs_cb_stat_to_errno(nfserr);

out:

out:

	return status;

	return status;

out_default:

	return nfs_cb_stat_to_errno(status);

}

}





/*

/*