SUNRPC: Move the task->tk_bytes_sent and tk_rtt to struct rpc_rqst

It seems strange to maintain stats for bytes_sent in one structure, and
bytes received in another. Try to assemble all the RPC request-related
stats in struct rpc_rqst

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index aacd95f0dce5..ea1046f3f9a3 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -156,13 +156,13 @@ void rpc_count_iostats(struct rpc_task *task)
         op_metrics->om_ntrans += req->rq_ntrans;
         op_metrics->om_timeouts += task->tk_timeouts;
 
-        op_metrics->om_bytes_sent += task->tk_bytes_sent;
+        op_metrics->om_bytes_sent += req->rq_xmit_bytes_sent;
         op_metrics->om_bytes_recv += req->rq_reply_bytes_recvd;
 
         delta = ktime_sub(req->rq_xtime, task->tk_start);
         op_metrics->om_queue = ktime_add(op_metrics->om_queue, delta);
 
-        op_metrics->om_rtt = ktime_add(op_metrics->om_rtt, task->tk_rtt);
+        op_metrics->om_rtt = ktime_add(op_metrics->om_rtt, req->rq_rtt);
 
         delta = ktime_sub(ktime_get(), task->tk_start);
         op_metrics->om_execute = ktime_add(op_metrics->om_execute, delta);