lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SUNRPC: New xdr_streams XDR decoder API

Browse Source 
Now that all client-side XDR decoder routines use xdr_streams, there
should be no need to support the legacy calling sequence [rpc_rqst *,
__be32 *, RPC res *] anywhere.  We can construct an xdr_stream in the
generic RPC code, instead of in each decoder function.

This is a refactoring change.  It should not cause different behavior.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever
2010-12-14 14:59:29 +00:00
committed by Trond Myklebust
parent 9f06c719f4
commit bf2695516d
15 changed files with 518 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fs/lockd/clntxdr.c
View File

@@ -527,17 +527,16 @@ out:
return error;
}
static int nlm_xdr_dec_testres(struct rpc_rqst *req, __be32 *p,
static int nlm_xdr_dec_testres(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nlm_res *result)
{
struct xdr_stream xdr;
int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
error = decode_cookie(&xdr, &result->cookie);
error = decode_cookie(xdr, &result->cookie);
if (unlikely(error))
goto out;
error = decode_nlm_testrply(&xdr, result);
error = decode_nlm_testrply(xdr, result);
out:
return error;
}
@@ -548,17 +547,16 @@ out:
* nlm_stat stat;
* };
*/
static int nlm_xdr_dec_res(struct rpc_rqst *req, __be32 *p,
static int nlm_xdr_dec_res(struct rpc_rqst *req,
struct xdr_stream *xdr,
struct nlm_res *result)
{
struct xdr_stream xdr;
int error;
xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
error = decode_cookie(&xdr, &result->cookie);
error = decode_cookie(xdr, &result->cookie);
if (unlikely(error))
goto out;
error = decode_nlm_stat(&xdr, &result->status);
error = decode_nlm_stat(xdr, &result->status);
out:
return error;
}
@@ -573,7 +571,7 @@ out:
[NLMPROC_##proc] = { \
.p_proc = NLMPROC_##proc, \
.p_encode = (kxdreproc_t)nlm_xdr_enc_##argtype, \
.p_decode = (kxdrproc_t)nlm_xdr_dec_##restype, \
.p_decode = (kxdrdproc_t)nlm_xdr_dec_##restype, \
.p_arglen = NLM_##argtype##_sz, \
.p_replen = NLM_##restype##_sz, \
.p_statidx = NLMPROC_##proc, \