From owner-svn-src-all@FreeBSD.ORG  Wed May 18 01:26:08 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 942C31065672;
	Wed, 18 May 2011 01:26:08 +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 6E6EA8FC08;
	Wed, 18 May 2011 01:26:08 +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 p4I1Q8KS055060;
	Wed, 18 May 2011 01:26:08 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4I1Q8UT055058;
	Wed, 18 May 2011 01:26:08 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201105180126.p4I1Q8UT055058@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Wed, 18 May 2011 01:26:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222045 - stable/8/usr.bin/nfsstat
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 May 2011 01:26:08 -0000

Author: rmacklem
Date: Wed May 18 01:26:08 2011
New Revision: 222045
URL: http://svn.freebsd.org/changeset/base/222045

Log:
  MFC: r221440
  Fix nfsstat.c so that the "-z" option works for the new
  NFS subsystem.

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:14:27 2011	(r222044)
+++ stable/8/usr.bin/nfsstat/nfsstat.c	Wed May 18 01:26:08 2011	(r222045)
@@ -164,10 +164,7 @@ main(int argc, char **argv)
 	if (run_v4 != 0 && modfind("nfscommon") < 0)
 		errx(1, "experimental client/server not loaded");
 
-	if (run_v4 != 0) {
-		if (nfssvc(NFSSVC_GETSTATS, &ext_nfsstats) < 0)
-			err(1, "Can't get stats");
-	} else if (nlistf != NULL || memf != NULL) {
+	if (run_v4 == 0 && (nlistf != NULL || memf != NULL)) {
 		deadkernel = 1;
 
 		if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY,
@@ -549,7 +546,17 @@ sperc2(int ttl, int misses)
 void
 exp_intpr(int clientOnly, int serverOnly)
 {
+	int nfssvc_flag;
 
+	nfssvc_flag = NFSSVC_GETSTATS;
+	if (zflag != 0) {
+		if (clientOnly != 0)
+			nfssvc_flag |= NFSSVC_ZEROCLTSTATS;
+		if (serverOnly != 0)
+			nfssvc_flag |= NFSSVC_ZEROSRVSTATS;
+	}
+	if (nfssvc(nfssvc_flag, &ext_nfsstats) < 0)
+		err(1, "Can't get stats");
 	if (clientOnly != 0) {
 		if (printtitle) {
 			printf("Client Info:\n");