Bug#434442: Patch to provide support for NFS Version 4

[Dominique Brazziel]

I think this patch enables correct reporting of NFS
version 4 client ('sar -n NFS') and server ('sar -n
NFSD') statistics.  I've tested the client part but 
haven't tested the server part yet, will try this weekend.
--- sadc.old	2007-08-04 00:56:29.000000000 -0400
+++ sadc.c	2007-08-04 00:45:42.000000000 -0400
@@ -64,6 +64,9 @@
 unsigned int u_tmp[NR_DISKS - 1];
 char comment[MAX_COMMENT_LEN];
 
+/* NFS V4 support */
+char *v3czeroes = "0 0 0 0 0 0 0 0 0";	/* Version 3 client zero counts */
+char *v3szeroes = "0 0 0 0 0 0 0 0";	/* Version 3 server zero counts  (NULL count may be non-zero */
 
 /*
  ***************************************************************************
@@ -1270,6 +1273,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 +1289,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, v3czeroes, strlen(v3czeroes)))
 	 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_getattcnt), &(file_stats.nfs_accesscnt));
    }
 
    fclose(fp);
@@ -1299,7 +1314,14 @@
 {
    FILE *fp;
    static char line[256];
-
+   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 +1340,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, v3szeroes, strlen(v3szeroes)))
 	 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