SUNRPC: Don't reset the request 'bytes_sent' counter when releasing XPRT_LOCK (04b3b88f) · Commits · 戴 / test

net/sunrpc/clnt.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -2128,15 +2128,11 @@ static void
		call_status(struct rpc_task *task)
		{
		struct rpc_clnt *clnt = task->tk_client;
		struct rpc_rqst *req = task->tk_rqstp;
		int status;

		if (!task->tk_msg.rpc_proc->p_proc)
		trace_xprt_ping(task->tk_xprt, task->tk_status);

		if (req->rq_reply_bytes_recvd > 0 && !req->rq_bytes_sent)
		task->tk_status = req->rq_reply_bytes_recvd;

		dprint_status(task);

		status = task->tk_status;

net/sunrpc/xprt.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -332,15 +332,6 @@ out_unlock:
		xprt_clear_locked(xprt);
		}

		static void xprt_task_clear_bytes_sent(struct rpc_task *task)
		{
		if (task != NULL) {
		struct rpc_rqst *req = task->tk_rqstp;
		if (req != NULL)
		req->rq_bytes_sent = 0;
		}
		}

		/**
		* xprt_release_xprt - allow other requests to use a transport
		* @xprt: transport with other tasks potentially waiting
		@@ -351,7 +342,6 @@ static void xprt_task_clear_bytes_sent(struct rpc_task *task)
		void xprt_release_xprt(struct rpc_xprt xprt, struct rpc_task task)
		{
		if (xprt->snd_task == task) {
		xprt_task_clear_bytes_sent(task);
		xprt_clear_locked(xprt);
		__xprt_lock_write_next(xprt);
		}
		@@ -369,7 +359,6 @@ EXPORT_SYMBOL_GPL(xprt_release_xprt);
		void xprt_release_xprt_cong(struct rpc_xprt xprt, struct rpc_task task)
		{
		if (xprt->snd_task == task) {
		xprt_task_clear_bytes_sent(task);
		xprt_clear_locked(xprt);
		__xprt_lock_write_next_cong(xprt);
		}
		@@ -742,7 +731,6 @@ bool xprt_lock_connect(struct rpc_xprt *xprt,
		goto out;
		if (xprt->snd_task != task)
		goto out;
		xprt_task_clear_bytes_sent(task);
		xprt->snd_task = cookie;
		ret = true;
		out:
		@@ -788,7 +776,6 @@ void xprt_connect(struct rpc_task *task)
		xprt->ops->close(xprt);

		if (!xprt_connected(xprt)) {
		task->tk_rqstp->rq_bytes_sent = 0;
		task->tk_timeout = task->tk_rqstp->rq_timeout;
		task->tk_rqstp->rq_connect_cookie = xprt->connect_cookie;
		rpc_sleep_on(&xprt->pending, task, xprt_connect_status);
		@@ -1094,7 +1081,6 @@ xprt_request_enqueue_transmit(struct rpc_task *task)
		static void
		xprt_request_dequeue_transmit_locked(struct rpc_task *task)
		{
		xprt_task_clear_bytes_sent(task);
		if (test_and_clear_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate))
		list_del(&task->tk_rqstp->rq_xmit);
		}

Admin message