SUNRPC: Ensure rq_bytes_sent is reset before request transmission

When we resend a request, ensure that the 'rq_bytes_sent' is reset
to zero.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c
index ec451b8114b0b07dbe5db102af8002d58b7804cd..b9313c15ee3a2d1a4b2935d5fb4d464b6b213862 100644 (file)
--- a/net/sunrpc/backchannel_rqst.c
+++ b/net/sunrpc/backchannel_rqst.c
@@ -252,7 +252,6 @@ static struct rpc_rqst *xprt_alloc_bc_request(struct rpc_xprt *xprt, __be32 xid)
        req = list_first_entry(&xprt->bc_pa_list, struct rpc_rqst,
                                rq_bc_pa_list);
        req->rq_reply_bytes_recvd = 0;
-       req->rq_bytes_sent = 0;
        memcpy(&req->rq_private_buf, &req->rq_rcv_buf,
                        sizeof(req->rq_private_buf));
        req->rq_xid = xid;

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index b95f4452dbc693b75172b8f22411d20ebb93858c..1587728f40d1fe8a417a5b472d1db62474fca476 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1602,7 +1602,6 @@ xprt_request_init(struct rpc_task *task)
        req->rq_buffer  = NULL;
        req->rq_xid     = xprt_alloc_xid(xprt);
        xprt_init_connect_cookie(req, xprt);
-       req->rq_bytes_sent = 0;
        req->rq_snd_buf.len = 0;
        req->rq_snd_buf.buflen = 0;
        req->rq_rcv_buf.len = 0;
@@ -1752,7 +1751,6 @@ xprt_init_bc_request(struct rpc_rqst *req, struct rpc_task *task)
         */
        xbufp->len = xbufp->head[0].iov_len + xbufp->page_len +
                xbufp->tail[0].iov_len;
-       req->rq_bytes_sent = 0;
 }
 #endif
 

diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c
index 0de9b3e63770f21b0827e035349d5819fb1ab964..749452724e6e424e718303276337a502aac8871e 100644 (file)
--- a/net/sunrpc/xprtrdma/backchannel.c
+++ b/net/sunrpc/xprtrdma/backchannel.c
@@ -267,7 +267,6 @@ void rpcrdma_bc_receive_call(struct rpcrdma_xprt *r_xprt,
 
        /* Prepare rqst */
        rqst->rq_reply_bytes_recvd = 0;
-       rqst->rq_bytes_sent = 0;
        rqst->rq_xid = *p;
 
        rqst->rq_private_buf.len = size;

diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index fbc171ebfe9172dd8eb9a29f35ce6ef3e9bdeea3..3c490172d383886118845440259e8921cd33eaed 100644 (file)
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -738,7 +738,6 @@ xprt_rdma_send_request(struct rpc_rqst *rqst)
                goto drop_connection;
 
        rqst->rq_xmit_bytes_sent += rqst->rq_snd_buf.len;
-       rqst->rq_bytes_sent = 0;
 
        /* An RPC with no reply will throw off credit accounting,
         * so drop the connection to reset the credit grant.

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index da45bb1e931e7e11e4d6741a97c5a2538af7b298..5d22c175c7dd00bd6cd9a4ab0655fd806e4d6baf 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -951,7 +951,6 @@ static int xs_local_send_request(struct rpc_rqst *req)
                req->rq_bytes_sent = transport->xmit.offset;
                if (likely(req->rq_bytes_sent >= req->rq_slen)) {
                        req->rq_xmit_bytes_sent += transport->xmit.offset;
-                       req->rq_bytes_sent = 0;
                        transport->xmit.offset = 0;
                        return 0;
                }
@@ -1117,7 +1116,6 @@ static int xs_tcp_send_request(struct rpc_rqst *req)
                req->rq_bytes_sent = transport->xmit.offset;
                if (likely(req->rq_bytes_sent >= req->rq_slen)) {
                        req->rq_xmit_bytes_sent += transport->xmit.offset;
-                       req->rq_bytes_sent = 0;
                        transport->xmit.offset = 0;
                        return 0;
                }