svn commit: r225442 - stable/8/usr.bin/nfsstat
Rick Macklem
rmacklem at FreeBSD.org
Thu Sep 8 00:45:29 UTC 2011
Author: rmacklem
Date: Thu Sep 8 00:45:28 2011
New Revision: 225442
URL: http://svn.freebsd.org/changeset/base/225442
Log:
MFC: r225109
Fix nfsstat(1) so that it prints out correct stats for the
new NFS server when the "-w" option is used. The problem was
spotted by hrs@ during testing where srvrpcnt[] must be indexed
by NFSV4OP_XXX and not NFSPROC_XXX.
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 Sep 7 18:00:05 2011 (r225441)
+++ stable/8/usr.bin/nfsstat/nfsstat.c Thu Sep 8 00:45:28 2011 (r225442)
@@ -857,24 +857,24 @@ exp_sidewaysintpr(u_int interval, int cl
if (serverOnly) {
printf("%s %6d %6d %6d %6d %6d %6d %6d %6d",
((clientOnly && serverOnly) ? "Server:" : ""),
- nfsstats.srvrpccnt[NFSPROC_GETATTR] -
- lastst.srvrpccnt[NFSPROC_GETATTR],
- nfsstats.srvrpccnt[NFSPROC_LOOKUP] -
- lastst.srvrpccnt[NFSPROC_LOOKUP],
- nfsstats.srvrpccnt[NFSPROC_READLINK] -
- lastst.srvrpccnt[NFSPROC_READLINK],
- nfsstats.srvrpccnt[NFSPROC_READ] -
- lastst.srvrpccnt[NFSPROC_READ],
- nfsstats.srvrpccnt[NFSPROC_WRITE] -
- lastst.srvrpccnt[NFSPROC_WRITE],
- nfsstats.srvrpccnt[NFSPROC_RENAME] -
- lastst.srvrpccnt[NFSPROC_RENAME],
- nfsstats.srvrpccnt[NFSPROC_ACCESS] -
- lastst.srvrpccnt[NFSPROC_ACCESS],
- (nfsstats.srvrpccnt[NFSPROC_READDIR] -
- lastst.srvrpccnt[NFSPROC_READDIR]) +
- (nfsstats.srvrpccnt[NFSPROC_READDIRPLUS] -
- lastst.srvrpccnt[NFSPROC_READDIRPLUS]));
+ nfsstats.srvrpccnt[NFSV4OP_GETATTR] -
+ lastst.srvrpccnt[NFSV4OP_GETATTR],
+ nfsstats.srvrpccnt[NFSV4OP_LOOKUP] -
+ lastst.srvrpccnt[NFSV4OP_LOOKUP],
+ nfsstats.srvrpccnt[NFSV4OP_READLINK] -
+ lastst.srvrpccnt[NFSV4OP_READLINK],
+ nfsstats.srvrpccnt[NFSV4OP_READ] -
+ lastst.srvrpccnt[NFSV4OP_READ],
+ nfsstats.srvrpccnt[NFSV4OP_WRITE] -
+ lastst.srvrpccnt[NFSV4OP_WRITE],
+ nfsstats.srvrpccnt[NFSV4OP_RENAME] -
+ lastst.srvrpccnt[NFSV4OP_RENAME],
+ nfsstats.srvrpccnt[NFSV4OP_ACCESS] -
+ lastst.srvrpccnt[NFSV4OP_ACCESS],
+ (nfsstats.srvrpccnt[NFSV4OP_READDIR] -
+ lastst.srvrpccnt[NFSV4OP_READDIR]) +
+ (nfsstats.srvrpccnt[NFSV4OP_READDIRPLUS] -
+ lastst.srvrpccnt[NFSV4OP_READDIRPLUS]));
printf("\n");
lastst = nfsstats;
}
More information about the svn-src-stable
mailing list