diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2017-08-10 12:47:20 -0400 |
|---|---|---|
| committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2017-08-11 13:20:08 -0400 |
| commit | f4a2805e7d14c530237d5c8d51c711157c276188 (patch) | |
| tree | b3b6586e9d23ac7d9920300983a59d2c6ed033f4 /net | |
| parent | 09e60641fc58960c9c63a9b6d1f57b194572dafc (diff) | |
xprtrdma: Remove rpclen from rpcrdma_marshal_req
Clean up: Remove a variable whose result is no longer used.
Commit 655fec6987be ("xprtrdma: Use gathered Send for large inline
messages") should have removed it.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/xprtrdma/rpc_rdma.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index d916e596d427..f1d63ac9d7c7 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c | |||
| @@ -677,7 +677,6 @@ rpcrdma_marshal_req(struct rpcrdma_xprt *r_xprt, struct rpc_rqst *rqst) | |||
| 677 | struct rpcrdma_msg *headerp; | 677 | struct rpcrdma_msg *headerp; |
| 678 | bool ddp_allowed; | 678 | bool ddp_allowed; |
| 679 | ssize_t hdrlen; | 679 | ssize_t hdrlen; |
| 680 | size_t rpclen; | ||
| 681 | __be32 *iptr; | 680 | __be32 *iptr; |
| 682 | 681 | ||
| 683 | #if defined(CONFIG_SUNRPC_BACKCHANNEL) | 682 | #if defined(CONFIG_SUNRPC_BACKCHANNEL) |
| @@ -731,16 +730,12 @@ rpcrdma_marshal_req(struct rpcrdma_xprt *r_xprt, struct rpc_rqst *rqst) | |||
| 731 | */ | 730 | */ |
| 732 | if (rpcrdma_args_inline(r_xprt, rqst)) { | 731 | if (rpcrdma_args_inline(r_xprt, rqst)) { |
| 733 | rtype = rpcrdma_noch; | 732 | rtype = rpcrdma_noch; |
| 734 | rpclen = rqst->rq_snd_buf.len; | ||
| 735 | } else if (ddp_allowed && rqst->rq_snd_buf.flags & XDRBUF_WRITE) { | 733 | } else if (ddp_allowed && rqst->rq_snd_buf.flags & XDRBUF_WRITE) { |
| 736 | rtype = rpcrdma_readch; | 734 | rtype = rpcrdma_readch; |
| 737 | rpclen = rqst->rq_snd_buf.head[0].iov_len + | ||
| 738 | rqst->rq_snd_buf.tail[0].iov_len; | ||
| 739 | } else { | 735 | } else { |
| 740 | r_xprt->rx_stats.nomsg_call_count++; | 736 | r_xprt->rx_stats.nomsg_call_count++; |
| 741 | headerp->rm_type = htonl(RDMA_NOMSG); | 737 | headerp->rm_type = htonl(RDMA_NOMSG); |
| 742 | rtype = rpcrdma_areadch; | 738 | rtype = rpcrdma_areadch; |
| 743 | rpclen = 0; | ||
| 744 | } | 739 | } |
| 745 | 740 | ||
| 746 | req->rl_xid = rqst->rq_xid; | 741 | req->rl_xid = rqst->rq_xid; |
| @@ -780,10 +775,10 @@ rpcrdma_marshal_req(struct rpcrdma_xprt *r_xprt, struct rpc_rqst *rqst) | |||
| 780 | goto out_err; | 775 | goto out_err; |
| 781 | hdrlen = (unsigned char *)iptr - (unsigned char *)headerp; | 776 | hdrlen = (unsigned char *)iptr - (unsigned char *)headerp; |
| 782 | 777 | ||
| 783 | dprintk("RPC: %5u %s: %s/%s: hdrlen %zd rpclen %zd\n", | 778 | dprintk("RPC: %5u %s: %s/%s: hdrlen %zd\n", |
| 784 | rqst->rq_task->tk_pid, __func__, | 779 | rqst->rq_task->tk_pid, __func__, |
| 785 | transfertypes[rtype], transfertypes[wtype], | 780 | transfertypes[rtype], transfertypes[wtype], |
| 786 | hdrlen, rpclen); | 781 | hdrlen); |
| 787 | 782 | ||
| 788 | if (!rpcrdma_prepare_send_sges(&r_xprt->rx_ia, req, hdrlen, | 783 | if (!rpcrdma_prepare_send_sges(&r_xprt->rx_ia, req, hdrlen, |
| 789 | &rqst->rq_snd_buf, rtype)) { | 784 | &rqst->rq_snd_buf, rtype)) { |
