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>

2 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 76720d262ef2..46ebef1788c6 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -80,9 +80,7 @@ struct rpc_task {
         } u;
 
         unsigned short          tk_timeouts;    /* maj timeouts */
-        size_t                  tk_bytes_sent;  /* total bytes sent */
-        ktime_t                 tk_start,       /* RPC task init timestamp */
-                                tk_rtt;         /* round-trip time */
+        ktime_t                 tk_start;       /* RPC task init timestamp */
 
         pid_t                   tk_owner;       /* Process id for batching tasks */
         unsigned char           tk_priority : 2;/* Task priority */
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index f8851861b744..b51470302399 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -66,8 +66,6 @@ struct rpc_rqst {
         struct rpc_task *       rq_task;        /* RPC task data */
         __be32                  rq_xid;         /* request XID */
         int                     rq_cong;        /* has incremented xprt->cong */
-        int                     rq_reply_bytes_recvd;   /* number of reply */
-                                                        /* bytes received */
         u32                     rq_seqno;       /* gss seq no. used on req. */
         int                     rq_enc_pages_num;
         struct page             **rq_enc_pages; /* scratch pages for use by
@@ -78,12 +76,16 @@ struct rpc_rqst {
         __u32 *                 rq_buffer;      /* XDR encode buffer */
         size_t                  rq_callsize,
                                 rq_rcvsize;
+        size_t                  rq_xmit_bytes_sent;     /* total bytes sent */
+        size_t                  rq_reply_bytes_recvd;   /* total reply bytes */
+                                                        /* received */
 
         struct xdr_buf          rq_private_buf;         /* The receive buffer
                                                          * used in the softirq.
                                                          */
         unsigned long           rq_majortimeo;  /* major timeout alarm */
         unsigned long           rq_timeout;     /* Current timeout value */
+        ktime_t                 rq_rtt;         /* round-trip time */
         unsigned int            rq_retries;     /* # of retries */
         unsigned int            rq_connect_cookie;
                                                 /* A cookie used to track the