Commit b9779a54 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 0ffe86f4

net/sunrpc/backchannel_rqst.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

net/sunrpc/xprt.c

+0 −2
Original line number Diff line number Diff line
@@ -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

net/sunrpc/xprtrdma/backchannel.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

net/sunrpc/xprtrdma/transport.c

+0 −1
Original line number Diff line number Diff line
@@ -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.

net/sunrpc/xprtsock.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE