diff options
| author | neilbrown <neilbrown> | 2002-05-05 23:33:30 +0000 |
|---|---|---|
| committer | neilbrown <neilbrown> | 2002-05-05 23:33:30 +0000 |
| commit | 84efbd57c04964b0f7b6b65d9f83943baa14f22d (patch) | |
| tree | 64c1f246a3baf8cc0cdccf295389dacfdc00ddca | |
| parent | 43180e51d5f19a6a6b9c908bfeeef0d8d0cc99fd (diff) | |
| download | nfs-utils-84efbd57c04964b0f7b6b65d9f83943baa14f22d.tar.gz nfs-utils-84efbd57c04964b0f7b6b65d9f83943baa14f22d.tar.xz nfs-utils-84efbd57c04964b0f7b6b65d9f83943baa14f22d.zip | |
Fix nfsstat ordering issue
| -rw-r--r-- | utils/nfsstat/nfsstat.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c index afd323e..739daba 100644 --- a/utils/nfsstat/nfsstat.c +++ b/utils/nfsstat/nfsstat.c @@ -59,8 +59,8 @@ static unsigned int svcfhinfo[6]; /* (for kernels >= 2.4.0) * 0 stale * 1 FH lookups * 2 'anon' FHs - * 3 noncached non-directories - * 4 noncached directories + * 3 noncached directories + * 4 noncached non-directories * leave hole to relocate stale for order * compatability. */ @@ -214,11 +214,17 @@ main(int argc, char **argv) /* * 2.2 puts all fh-related info after the 'rc' header * 2.4 puts all fh-related info after the 'fh' header, but relocates - * 'stale' to the start :-( We keep it at the end. + * 'stale' to the start and swaps dir and nondir :-( + * We preseve the 2.2 order */ if (opt_prt & PRNT_FH) { if (get_stat_info("fh", svcinfo)) { /* >= 2.4 */ + int t = svcfhinfo[3]; + svcfhinfo[3]=svcfhinfo[4]; + svcfhinfo[4]=t; + svcfhinfo[5]=svcfhinfo[0]; /* relocate 'stale' */ + print_numbers( "Server file handle cache:\n" "lookup anon ncachedir ncachedir stale\n", |