4 files changed, 29 insertions, 10 deletions

diff --git a/include/linux/nfs_iostat.h b/include/linux/nfs_iostat.h
index 8866bb3502ee..9dcbbe9a51fb 100644
--- a/include/linux/nfs_iostat.h
+++ b/include/linux/nfs_iostat.h
@@ -21,7 +21,7 @@
 #ifndef _LINUX_NFS_IOSTAT
 #define _LINUX_NFS_IOSTAT
 
-#define NFS_IOSTAT_VERS         "1.0"
+#define NFS_IOSTAT_VERS         "1.1"
 
 /*
  * NFS byte counters
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index b033f366d5f6..ea712f97f4a1 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -219,10 +219,13 @@ struct rpc_xprt {
                                         connect_time,   /* jiffies waiting for connect */
                                         sends,          /* how many complete requests */
                                         recvs,          /* how many complete requests */
-                                        bad_xids;       /* lookup_rqst didn't find XID */
+                                        bad_xids,       /* lookup_rqst didn't find XID */
+                                        max_slots;      /* max rpc_slots used */
 
                 unsigned long long      req_u,          /* average requests on the wire */
-                                        bklog_u;        /* backlog queue utilization */
+                                        bklog_u,        /* backlog queue utilization */
+                                        sending_u,      /* send q utilization */
+                                        pending_u;      /* pend q utilization */
         } stat;
 
         struct net              *xprt_net;
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index efe5495ecf65..739df8a11382 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -885,7 +885,7 @@ void xprt_transmit(struct rpc_task *task)
 {
         struct rpc_rqst *req = task->tk_rqstp;
         struct rpc_xprt *xprt = req->rq_xprt;
-        int status;
+        int status, numreqs;
 
         dprintk("RPC: %5u xprt_transmit(%u)\n", task->tk_pid, req->rq_slen);
 
@@ -922,9 +922,14 @@ void xprt_transmit(struct rpc_task *task)
 
         xprt->ops->set_retrans_timeout(task);
 
+        numreqs = atomic_read(&xprt->num_reqs);
+        if (numreqs > xprt->stat.max_slots)
+                xprt->stat.max_slots = numreqs;
         xprt->stat.sends++;
         xprt->stat.req_u += xprt->stat.sends - xprt->stat.recvs;
         xprt->stat.bklog_u += xprt->backlog.qlen;
+        xprt->stat.sending_u += xprt->sending.qlen;
+        xprt->stat.pending_u += xprt->pending.qlen;
 
         /* Don't race with disconnect */
         if (!xprt_connected(xprt))
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 55472c48825e..4c8281d29e2b 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2227,7 +2227,7 @@ static void xs_local_print_stats(struct rpc_xprt *xprt, struct seq_file *seq)
                 idle_time = (long)(jiffies - xprt->last_used) / HZ;
 
         seq_printf(seq, "\txprt:\tlocal %lu %lu %lu %ld %lu %lu %lu "
-                        "%llu %llu\n",
+                        "%llu %llu %lu %llu %llu\n",
                         xprt->stat.bind_count,
                         xprt->stat.connect_count,
                         xprt->stat.connect_time,
@@ -2236,7 +2236,10 @@ static void xs_local_print_stats(struct rpc_xprt *xprt, struct seq_file *seq)
                         xprt->stat.recvs,
                         xprt->stat.bad_xids,
                         xprt->stat.req_u,
-                        xprt->stat.bklog_u);
+                        xprt->stat.bklog_u,
+                        xprt->stat.max_slots,
+                        xprt->stat.sending_u,
+                        xprt->stat.pending_u);
 }
 
 /**
@@ -2249,14 +2252,18 @@ static void xs_udp_print_stats(struct rpc_xprt *xprt, struct seq_file *seq)
 {
         struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
 
-        seq_printf(seq, "\txprt:\tudp %u %lu %lu %lu %lu %Lu %Lu\n",
+        seq_printf(seq, "\txprt:\tudp %u %lu %lu %lu %lu %llu %llu "
+                        "%lu %llu %llu\n",
                         transport->srcport,
                         xprt->stat.bind_count,
                         xprt->stat.sends,
                         xprt->stat.recvs,
                         xprt->stat.bad_xids,
                         xprt->stat.req_u,
-                        xprt->stat.bklog_u);
+                        xprt->stat.bklog_u,
+                        xprt->stat.max_slots,
+                        xprt->stat.sending_u,
+                        xprt->stat.pending_u);
 }
 
 /**
@@ -2273,7 +2280,8 @@ static void xs_tcp_print_stats(struct rpc_xprt *xprt, struct seq_file *seq)
         if (xprt_connected(xprt))
                 idle_time = (long)(jiffies - xprt->last_used) / HZ;
 
-        seq_printf(seq, "\txprt:\ttcp %u %lu %lu %lu %ld %lu %lu %lu %Lu %Lu\n",
+        seq_printf(seq, "\txprt:\ttcp %u %lu %lu %lu %ld %lu %lu %lu "
+                        "%llu %llu %lu %llu %llu\n",
                         transport->srcport,
                         xprt->stat.bind_count,
                         xprt->stat.connect_count,
@@ -2283,7 +2291,10 @@ static void xs_tcp_print_stats(struct rpc_xprt *xprt, struct seq_file *seq)
                         xprt->stat.recvs,
                         xprt->stat.bad_xids,
                         xprt->stat.req_u,
-                        xprt->stat.bklog_u);
+                        xprt->stat.bklog_u,
+                        xprt->stat.max_slots,
+                        xprt->stat.sending_u,
+                        xprt->stat.pending_u);
 }
 
 /*