From owner-svn-src-head@FreeBSD.ORG  Wed May  4 19:28:45 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 57782106575B;
	Wed,  4 May 2011 19:28:45 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 45CFE8FC16;
	Wed,  4 May 2011 19:28:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p44JSjqO064151;
	Wed, 4 May 2011 19:28:45 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p44JSjUv064149;
	Wed, 4 May 2011 19:28:45 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201105041928.p44JSjUv064149@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Wed, 4 May 2011 19:28:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221454 - head/usr.bin/nfsstat
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2011 19:28:45 -0000

Author: rmacklem
Date: Wed May  4 19:28:44 2011
New Revision: 221454
URL: http://svn.freebsd.org/changeset/base/221454

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

Modified:
  head/usr.bin/nfsstat/nfsstat.c

Modified: head/usr.bin/nfsstat/nfsstat.c
==============================================================================
--- head/usr.bin/nfsstat/nfsstat.c	Wed May  4 18:41:26 2011	(r221453)
+++ head/usr.bin/nfsstat/nfsstat.c	Wed May  4 19:28:44 2011	(r221454)
@@ -650,9 +650,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",
@@ -660,9 +660,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,