Commit 5f69d5f6 authored by Chuck Lever's avatar Chuck Lever

SUNRPC: Final clean-up of svc_process_common()

The @resv parameter is no longer used.
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 649a692e
...@@ -1225,7 +1225,7 @@ EXPORT_SYMBOL_GPL(svc_generic_init_request); ...@@ -1225,7 +1225,7 @@ EXPORT_SYMBOL_GPL(svc_generic_init_request);
* Common routine for processing the RPC request. * Common routine for processing the RPC request.
*/ */
static int static int
svc_process_common(struct svc_rqst *rqstp, struct kvec *resv) svc_process_common(struct svc_rqst *rqstp)
{ {
struct xdr_stream *xdr = &rqstp->rq_res_stream; struct xdr_stream *xdr = &rqstp->rq_res_stream;
struct svc_program *progp; struct svc_program *progp;
...@@ -1455,7 +1455,7 @@ svc_process(struct svc_rqst *rqstp) ...@@ -1455,7 +1455,7 @@ svc_process(struct svc_rqst *rqstp)
if (unlikely(*p != rpc_call)) if (unlikely(*p != rpc_call))
goto out_baddir; goto out_baddir;
if (!svc_process_common(rqstp, resv)) if (!svc_process_common(rqstp))
goto out_drop; goto out_drop;
return svc_send(rqstp); return svc_send(rqstp);
...@@ -1478,7 +1478,6 @@ int ...@@ -1478,7 +1478,6 @@ int
bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req, bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req,
struct svc_rqst *rqstp) struct svc_rqst *rqstp)
{ {
struct kvec *resv = &rqstp->rq_res.head[0];
struct rpc_task *task; struct rpc_task *task;
int proc_error; int proc_error;
int error; int error;
...@@ -1509,22 +1508,21 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req, ...@@ -1509,22 +1508,21 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req,
rqstp->rq_arg.len = rqstp->rq_arg.head[0].iov_len + rqstp->rq_arg.len = rqstp->rq_arg.head[0].iov_len +
rqstp->rq_arg.page_len; rqstp->rq_arg.page_len;
/* reset result send buffer "put" position */ /* Reset the response buffer */
resv->iov_len = 0; rqstp->rq_res.head[0].iov_len = 0;
svcxdr_init_decode(rqstp);
/* /*
* Skip the XID and calldir fields because they've already * Skip the XID and calldir fields because they've already
* been processed by the caller. * been processed by the caller.
*/ */
svcxdr_init_decode(rqstp);
if (!xdr_inline_decode(&rqstp->rq_arg_stream, XDR_UNIT * 2)) { if (!xdr_inline_decode(&rqstp->rq_arg_stream, XDR_UNIT * 2)) {
error = -EINVAL; error = -EINVAL;
goto out; goto out;
} }
/* Parse and execute the bc call */ /* Parse and execute the bc call */
proc_error = svc_process_common(rqstp, resv); proc_error = svc_process_common(rqstp);
atomic_dec(&req->rq_xprt->bc_slot_count); atomic_dec(&req->rq_xprt->bc_slot_count);
if (!proc_error) { if (!proc_error) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment