From owner-svn-src-head@FreeBSD.ORG  Mon Jun  1 20:34:00 2009
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 D24DE1065680;
	Mon,  1 Jun 2009 20:34:00 +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 C0A938FC1B;
	Mon,  1 Jun 2009 20:34:00 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51KY01m090921;
	Mon, 1 Jun 2009 20:34:00 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51KY00Z090919;
	Mon, 1 Jun 2009 20:34:00 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <200906012034.n51KY00Z090919@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Mon, 1 Jun 2009 20:34:00 +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: r193258 - 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: Mon, 01 Jun 2009 20:34:01 -0000

Author: rmacklem
Date: Mon Jun  1 20:34:00 2009
New Revision: 193258
URL: http://svn.freebsd.org/changeset/base/193258

Log:
  Change the "-4" option flag to "-e" since it does not refer to IPv4
  and to make it consistent with the flag used by nfsd and mountd.
  
  Approved by:	kib (mentor)

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

Modified: head/usr.bin/nfsstat/nfsstat.1
==============================================================================
--- head/usr.bin/nfsstat/nfsstat.1	Mon Jun  1 20:30:00 2009	(r193257)
+++ head/usr.bin/nfsstat/nfsstat.1	Mon Jun  1 20:34:00 2009	(r193258)
@@ -42,7 +42,7 @@
 statistics
 .Sh SYNOPSIS
 .Nm
-.Op Fl cszW4
+.Op Fl ceszW
 .Op Fl M Ar core
 .Op Fl N Ar system
 .Op Fl w Ar wait
@@ -83,7 +83,7 @@ second intervals.
 .It Fl z
 Reset statistics after displaying them.
 (Not currently supported by the experimental nfs subsystem.)
-.It Fl 4
+.It Fl e
 Gather statistics from the experimental nfs subsystem that includes
 support for NFSv4 instead of the regular nfs subsystem.
 .El

Modified: head/usr.bin/nfsstat/nfsstat.c
==============================================================================
--- head/usr.bin/nfsstat/nfsstat.c	Mon Jun  1 20:30:00 2009	(r193257)
+++ head/usr.bin/nfsstat/nfsstat.c	Mon Jun  1 20:34:00 2009	(r193258)
@@ -113,7 +113,7 @@ main(int argc, char **argv)
 
 	interval = 0;
 	memf = nlistf = NULL;
-	while ((ch = getopt(argc, argv, "csWM:N:w:z4")) != -1)
+	while ((ch = getopt(argc, argv, "cesWM:N:w:z")) != -1)
 		switch(ch) {
 		case 'M':
 			memf = optarg;
@@ -140,7 +140,7 @@ main(int argc, char **argv)
 		case 'z':
 			zflag = 1;
 			break;
-		case '4':
+		case 'e':
 			run_v4 = 1;
 			break;
 		case '?':
@@ -505,7 +505,7 @@ void
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: nfsstat [-cszW] [-M core] [-N system] [-w interval]\n");
+	    "usage: nfsstat [-ceszW] [-M core] [-N system] [-w interval]\n");
 	exit(1);
 }