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

Commit f4a2805e authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Remove rpclen from rpcrdma_marshal_req 



Clean up: Remove a variable whose result is no longer used.
Commit 655fec69 ("xprtrdma: Use gathered Send for large inline
messages") should have removed it.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 09e60641

net/sunrpc/xprtrdma/rpc_rdma.c

+2 −7
Original line number Diff line number Diff line
@@ -677,7 +677,6 @@ rpcrdma_marshal_req(struct rpcrdma_xprt *r_xprt, struct rpc_rqst *rqst) 
	struct rpcrdma_msg *headerp;

	bool ddp_allowed;

	ssize_t hdrlen;

	size_t rpclen;

	__be32 *iptr;



#if defined(CONFIG_SUNRPC_BACKCHANNEL)
@@ -731,16 +730,12 @@ rpcrdma_marshal_req(struct rpcrdma_xprt *r_xprt, struct rpc_rqst *rqst) 
	 */

	if (rpcrdma_args_inline(r_xprt, rqst)) {

		rtype = rpcrdma_noch;

		rpclen = rqst->rq_snd_buf.len;

	} else if (ddp_allowed && rqst->rq_snd_buf.flags & XDRBUF_WRITE) {

		rtype = rpcrdma_readch;

		rpclen = rqst->rq_snd_buf.head[0].iov_len +

			 rqst->rq_snd_buf.tail[0].iov_len;

	} else {

		r_xprt->rx_stats.nomsg_call_count++;

		headerp->rm_type = htonl(RDMA_NOMSG);

		rtype = rpcrdma_areadch;

		rpclen = 0;

	}



	req->rl_xid = rqst->rq_xid;
@@ -780,10 +775,10 @@ rpcrdma_marshal_req(struct rpcrdma_xprt *r_xprt, struct rpc_rqst *rqst) 
		goto out_err;

	hdrlen = (unsigned char *)iptr - (unsigned char *)headerp;



	dprintk("RPC: %5u %s: %s/%s: hdrlen %zd rpclen %zd\n",

	dprintk("RPC: %5u %s: %s/%s: hdrlen %zd\n",

		rqst->rq_task->tk_pid, __func__,

		transfertypes[rtype], transfertypes[wtype],

		hdrlen, rpclen);

		hdrlen);



	if (!rpcrdma_prepare_send_sges(&r_xprt->rx_ia, req, hdrlen,

				       &rqst->rq_snd_buf, rtype)) {