svn commit: r222047 - stable/8/usr.bin/nfsstat

[Rick Macklem]

Author: rmacklem
Date: Wed May 18 01:47:23 2011
New Revision: 222047
URL: http://svn.freebsd.org/changeset/base/222047

Log:
  MFC: r221454
  Modify nfsstat(1) so that it prints out the buffer cache
  stats in the same way for the new client as the old one.

Modified:
  stable/8/usr.bin/nfsstat/nfsstat.c
Directory Properties:
  stable/8/usr.bin/nfsstat/   (props changed)

Modified: stable/8/usr.bin/nfsstat/nfsstat.c
==============================================================================
--- stable/8/usr.bin/nfsstat/nfsstat.c	Wed May 18 01:36:42 2011	(r222046)
+++ stable/8/usr.bin/nfsstat/nfsstat.c	Wed May 18 01:47:23 2011	(r222047)
@@ -654,9 +654,9 @@ exp_intpr(int clientOnly, int serverOnly
 		    ext_nfsstats.lookupcache_hits,
 		    ext_nfsstats.lookupcache_misses);
 		printf(" %9d %9d %9d %9d\n",
-		    ext_nfsstats.biocache_reads,
+		    ext_nfsstats.biocache_reads - ext_nfsstats.read_bios,
 		    ext_nfsstats.read_bios,
-		    ext_nfsstats.biocache_writes,
+		    ext_nfsstats.biocache_writes - ext_nfsstats.write_bios,
 		    ext_nfsstats.write_bios);
 		if (printtitle) {
 			printf("%9.9s %9.9s %9.9s %9.9s",
@@ -664,9 +664,11 @@ exp_intpr(int clientOnly, int serverOnly
 			printf(" %9.9s %9.9s\n", "DirE Hits", "Misses");
 		}
 		printf("%9d %9d %9d %9d",
-		    ext_nfsstats.biocache_readlinks,
+		    ext_nfsstats.biocache_readlinks -
 		    ext_nfsstats.readlink_bios,
-		    ext_nfsstats.biocache_readdirs,
+		    ext_nfsstats.readlink_bios,
+		    ext_nfsstats.biocache_readdirs -
+		    ext_nfsstats.readdir_bios,
 		    ext_nfsstats.readdir_bios);
 		printf(" %9d %9d\n",
 		    ext_nfsstats.direofcache_hits,