Bug#434442: Ugh, getattr and access counts for client transposed

[Dominique Brazziel]

OK, this time for sure (I think).
--- sadc.c.save	2007-08-20 20:22:40.000000000 -0400
+++ sadc.c	2007-08-20 20:22:17.000000000 -0400
@@ -64,6 +64,8 @@
 unsigned int u_tmp[NR_DISKS - 1];
 char comment[MAX_COMMENT_LEN];
 
+/* NFS V4 support */
+char *v3zeroes = "0 0 0 0 0 0 0 0";	/* Version 3 zero counts */
 
 /*
  ***************************************************************************
@@ -1270,6 +1272,12 @@
 {
    FILE *fp;
    static char line[256];
+   
+   /* NFS Version 4 client support */
+   static char *v4cfmt = "%*u %*u %u %u %*u %*u "	/* Version 4 client format */
+			 "%*u %*u %*u %*u %*u %*u "
+			 "%*u %*u %*u %*u %*u %*u "
+			 "%u %u";         
 
    if ((fp = fopen(NET_RPC_NFS, "r")) == NULL)
       return;
@@ -1280,10 +1288,16 @@
 	 sscanf(line + 3, "%u %u",
 		&(file_stats.nfs_rpccnt), &(file_stats.nfs_rpcretrans));
 	
-      else if (!strncmp(line, "proc3", 5))
+      else if (!strncmp(line, "proc3", 5) && !strncmp(line + 9, v3zeroes, strlen(v3zeroes)))
 	 sscanf(line + 5, "%*u %*u %u %*u %*u %u %*u %u %u",
 		&(file_stats.nfs_getattcnt), &(file_stats.nfs_accesscnt),
 		&(file_stats.nfs_readcnt), &(file_stats.nfs_writecnt));
+		
+      /* NFS Version 4 client support */
+      else if (!strncmp(line, "proc4", 5))
+         sscanf(line + 5, v4cfmt, 
+		&(file_stats.nfs_readcnt), &(file_stats.nfs_writecnt),
+		&(file_stats.nfs_accesscnt), &(file_stats.nfs_getattcnt));
    }
 
    fclose(fp);
@@ -1299,7 +1313,16 @@
 {
    FILE *fp;
    static char line[256];
-
+   
+   /* NFS Version 4 server support */
+   static char *v4sfmt = "%*u %*u %*u %*u %u %*u "	/* Version 4 server format */
+			 "%*u %*u %*u %*u %u %*u "
+			 "%*u %*u %*u %*u %*u %*u "
+			 "%*u %*u %*u %*u %*u %*u "
+			 "%*u %*u %u %*u %*u %*u "
+			 "%*u %*u %*u %*u %*u %*u "
+			 "%*u %*u %*u %u"; 
+			 
    if ((fp = fopen(NET_RPC_NFSD, "r")) == NULL)
       return;
 
@@ -1318,17 +1341,20 @@
 	 sscanf(line + 3, "%u %u",
 		&(file_stats.nfsd_rpccnt), &(file_stats.nfsd_rpcbad));
 	
-      else if (!strncmp(line, "proc3", 5))
+      else if (!strncmp(line, "proc3", 5) && !strncmp(line + 11, v3zeroes, strlen(v3zeroes)))
 	 sscanf(line + 5, "%*u %*u %u %*u %*u %u %*u %u %u",
 		&(file_stats.nfsd_getattcnt), &(file_stats.nfsd_accesscnt),
 		&(file_stats.nfsd_readcnt), &(file_stats.nfsd_writecnt));
+      else if (!strncmp(line + 8, "proc4ops", 8))
+         sscanf(line + 8, v4sfmt,
+		&(file_stats.nfsd_accesscnt), &(file_stats.nfsd_getattcnt),
+		&(file_stats.nfsd_readcnt), &(file_stats.nfsd_writecnt));
    }
 
    fclose(fp);
 }
 
 
-
 /*
  ***************************************************************************
  * Read stats from /proc/diskstats