Date: Tue, 23 Aug 2011 13:44:56 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r225113 - head/usr.bin/nfsstat Message-ID: <201108231344.p7NDiuuh005094@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Tue Aug 23 13:44:56 2011 New Revision: 225113 URL: http://svn.freebsd.org/changeset/base/225113 Log: Fix nfsstat(1) so that it prints out correct stats for the new NFS server when the "-e" option is not used. The bug was that srvrpccnt[] was being indexed by NFSPROC_XXX when it needs to be indexed by NFSV4OP_XXX. Tested by: hrs Approved by: re (bz) Modified: head/usr.bin/nfsstat/nfsstat.c Modified: head/usr.bin/nfsstat/nfsstat.c ============================================================================== --- head/usr.bin/nfsstat/nfsstat.c Tue Aug 23 13:36:34 2011 (r225112) +++ head/usr.bin/nfsstat/nfsstat.c Tue Aug 23 13:44:56 2011 (r225113) @@ -444,14 +444,14 @@ intpr(int clientOnly, int serverOnly) nfsrvstats.srvrpccnt[NFSPROC_REMOVE]); else printf("%9d %9d %9d %9d %9d %9d %9d %9d\n", - ext_nfsstats.srvrpccnt[NFSPROC_GETATTR], - ext_nfsstats.srvrpccnt[NFSPROC_SETATTR], - ext_nfsstats.srvrpccnt[NFSPROC_LOOKUP], - ext_nfsstats.srvrpccnt[NFSPROC_READLINK], - ext_nfsstats.srvrpccnt[NFSPROC_READ], - ext_nfsstats.srvrpccnt[NFSPROC_WRITE], - ext_nfsstats.srvrpccnt[NFSPROC_CREATE], - ext_nfsstats.srvrpccnt[NFSPROC_REMOVE]); + ext_nfsstats.srvrpccnt[NFSV4OP_GETATTR], + ext_nfsstats.srvrpccnt[NFSV4OP_SETATTR], + ext_nfsstats.srvrpccnt[NFSV4OP_LOOKUP], + ext_nfsstats.srvrpccnt[NFSV4OP_READLINK], + ext_nfsstats.srvrpccnt[NFSV4OP_READ], + ext_nfsstats.srvrpccnt[NFSV4OP_WRITE], + ext_nfsstats.srvrpccnt[NFSV4OP_CREATE], + ext_nfsstats.srvrpccnt[NFSV4OP_REMOVE]); printf("%9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s %9.9s\n", "Rename", "Link", "Symlink", "Mkdir", "Rmdir", "Readdir", "RdirPlus", "Access"); @@ -467,14 +467,14 @@ intpr(int clientOnly, int serverOnly) nfsrvstats.srvrpccnt[NFSPROC_ACCESS]); else printf("%9d %9d %9d %9d %9d %9d %9d %9d\n", - ext_nfsstats.srvrpccnt[NFSPROC_RENAME], - ext_nfsstats.srvrpccnt[NFSPROC_LINK], - ext_nfsstats.srvrpccnt[NFSPROC_SYMLINK], - ext_nfsstats.srvrpccnt[NFSPROC_MKDIR], - ext_nfsstats.srvrpccnt[NFSPROC_RMDIR], - ext_nfsstats.srvrpccnt[NFSPROC_READDIR], - ext_nfsstats.srvrpccnt[NFSPROC_READDIRPLUS], - ext_nfsstats.srvrpccnt[NFSPROC_ACCESS]); + ext_nfsstats.srvrpccnt[NFSV4OP_RENAME], + ext_nfsstats.srvrpccnt[NFSV4OP_LINK], + ext_nfsstats.srvrpccnt[NFSV4OP_SYMLINK], + ext_nfsstats.srvrpccnt[NFSV4OP_MKDIR], + ext_nfsstats.srvrpccnt[NFSV4OP_RMDIR], + ext_nfsstats.srvrpccnt[NFSV4OP_READDIR], + ext_nfsstats.srvrpccnt[NFSV4OP_READDIRPLUS], + ext_nfsstats.srvrpccnt[NFSV4OP_ACCESS]); printf("%9.9s %9.9s %9.9s %9.9s %9.9s\n", "Mknod", "Fsstat", "Fsinfo", "PathConf", "Commit"); if (run_v4 == 0) @@ -486,11 +486,11 @@ intpr(int clientOnly, int serverOnly) nfsrvstats.srvrpccnt[NFSPROC_COMMIT]); else printf("%9d %9d %9d %9d %9d\n", - ext_nfsstats.srvrpccnt[NFSPROC_MKNOD], - ext_nfsstats.srvrpccnt[NFSPROC_FSSTAT], - ext_nfsstats.srvrpccnt[NFSPROC_FSINFO], - ext_nfsstats.srvrpccnt[NFSPROC_PATHCONF], - ext_nfsstats.srvrpccnt[NFSPROC_COMMIT]); + ext_nfsstats.srvrpccnt[NFSV4OP_MKNOD], + ext_nfsstats.srvrpccnt[NFSV4OP_FSSTAT], + ext_nfsstats.srvrpccnt[NFSV4OP_FSINFO], + ext_nfsstats.srvrpccnt[NFSV4OP_PATHCONF], + ext_nfsstats.srvrpccnt[NFSV4OP_COMMIT]); printf("Server Ret-Failed\n"); if (run_v4 == 0) printf("%17d\n", nfsrvstats.srvrpc_errs); @@ -531,8 +531,8 @@ intpr(int clientOnly, int serverOnly) * only useful for NFSv2. */ printf("%9d %9d %9d\n", - ext_nfsstats.srvrpccnt[NFSPROC_WRITE], - ext_nfsstats.srvrpccnt[NFSPROC_WRITE], 0); + ext_nfsstats.srvrpccnt[NFSV4OP_WRITE], + ext_nfsstats.srvrpccnt[NFSV4OP_WRITE], 0); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108231344.p7NDiuuh005094>