Merge with Linux 2.3.99-pre3.

1 files changed, 34 insertions, 11 deletions

diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c
index 69defe790..254242fb6 100644
--- a/fs/nfsd/stats.c
+++ b/fs/nfsd/stats.c
@@ -8,6 +8,16 @@
  * Format:
  *	rc <hits> <misses> <nocache>
  *			Statistsics for the reply cache
+ *	fh <stale> <total-lookups> <anonlookups> <dir-not-in-dcache> <nondir-not-in-dcache>
+ *			statistics for filehandle lookup
+ *	io <bytes-read> <bytes-writtten>
+ *			statistics for IO throughput
+ *	th <threads> <fullcnt> <10%-20%> <20%-30%> ... <90%-100%> <100%> 
+ *			time (milliseconds) when nfsd thread usage above thresholds
+ *			and number of times that all threads were in use
+ *	ra cache-size  <10%  <20%  <30% ... <100% not-found
+ *			number of times that read-ahead entry was found that deep in
+ *			the cache.
  *	plus generic RPC stats (see net/sunrpc/stats.c)
  *
  * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
@@ -33,17 +43,30 @@ nfsd_proc_read(char *buffer, char **start, off_t offset, int count,
 				int *eof, void *data)
 {
 	int	len;
+	int	i;
 
-	len = sprintf(buffer, "rc %d %d %d  %d %d %d %d %d\n",
-			nfsdstats.rchits,
-			nfsdstats.rcmisses,
-			nfsdstats.rcnocache,
-			nfsdstats.fh_stale,
-			nfsdstats.fh_lookup,
-		        nfsdstats.fh_anon,
-			nfsdstats.fh_nocache_dir,
-			nfsdstats.fh_nocache_nondir);
+	len = sprintf(buffer, "rc %u %u %u\nfh %u %u %u %u %u\nio %u %u\n",
+		      nfsdstats.rchits,
+		      nfsdstats.rcmisses,
+		      nfsdstats.rcnocache,
+		      nfsdstats.fh_stale,
+		      nfsdstats.fh_lookup,
+		      nfsdstats.fh_anon,
+		      nfsdstats.fh_nocache_dir,
+		      nfsdstats.fh_nocache_nondir,
+		      nfsdstats.io_read,
+		      nfsdstats.io_write);
+	/* thread usage: */
+	len += sprintf(buffer+len, "th %u %u", nfsdstats.th_cnt, nfsdstats.th_fullcnt);
+	for (i=0; i<10; i++)
+		len += sprintf(buffer+len, " %u", nfsdstats.th_usage[i]);
 
+	/* newline and ra-cache */
+	len += sprintf(buffer+len, "\nra %u", nfsdstats.ra_size);
+	for (i=0; i<11; i++)
+		len += sprintf(buffer+len, " %u", nfsdstats.ra_depth[i]);
+	len += sprintf(buffer+len, "\n");
+	
 
 	/* Assume we haven't hit EOF yet. Will be set by svc_proc_read. */
 	*eof = 0;
@@ -53,13 +76,13 @@ nfsd_proc_read(char *buffer, char **start, off_t offset, int count,
 	 */
 	if (len <= offset) {
 		len = svc_proc_read(buffer, start, offset - len, count,
-				eof, data);
+				    eof, data);
 		return len;
 	}
 
 	if (len < count) {
 		len += svc_proc_read(buffer + len, start, 0, count - len,
-				eof, data);
+				     eof, data);
 	}
 
 	if (offset >= len) {