X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fnfs.c;h=0948bc79a6534f23a39c2d305b3b4869d0cd5204;hb=21058a13ed34ade6d2de0f54e4216b255d033af1;hp=c466439c0a7730548ac502c5e9bcf976505a665e;hpb=b304d0ba166a5e69baa9a5c379cef814e541f65d;p=collectd.git

diff --git a/src/nfs.c b/src/nfs.c
index c466439c..0948bc79 100644
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -221,7 +221,7 @@ static size_t nfs4_server40_procedures_names_num = STATIC_ARRAY_SIZE (nfs4_serve
 static const char *nfs4_server41_procedures_names[] =
 {
 	"backchannel_ctl",
-	"bind_conn_to_session",	
+	"bind_conn_to_session",
 	"exchange_id",
 	"create_session",
 	"destroy_session",
@@ -296,11 +296,11 @@ static const char *nfs4_client40_procedures_names[] =
 
 static const char *nfs4_client41_procedures_names[] =
 {
-	"exchange_id",		/* |40| 3.6.30 */
-	"create_session",	/* |40| 3.6.30 */
-	"destroy_session",	/* |40| 3.6.30 */
-	"sequence",		/* |40| 3.6.30 */
-	"get_lease_time",	/* |40| 3.6.30 */
+	"exchange_id",		/* |40| 2.6.30 */
+	"create_session",	/* |40| 2.6.30 */
+	"destroy_session",	/* |40| 2.6.30 */
+	"sequence",		/* |40| 2.6.30 */
+	"get_lease_time",	/* |40| 2.6.30 */
 	"reclaim_complete",	/* |41| 2.6.33 */
 	"layoutget",		/* |44| 2.6.37 */
 	"getdeviceinfo",	/* |44| 2.6.37 */
@@ -404,7 +404,7 @@ static void nfs_procedures_submit (const char *plugin_instance,
 } /* void nfs_procedures_submit */
 
 #if KERNEL_LINUX
-static void nfs_submit_fields (int nfs_version, const char *instance, 
+static void nfs_submit_fields (int nfs_version, const char *instance,
 		char **fields, size_t fields_num, const char **proc_names)
 {
 	char plugin_instance[DATA_MAX_NAME_LEN];
@@ -434,19 +434,19 @@ static int nfs_submit_fields_safe (int nfs_version, const char *instance,
 		return (EINVAL);
 	}
 
-	nfs_submit_fields (nfs_version, instance, fields, fields_num, 
+	nfs_submit_fields (nfs_version, instance, fields, fields_num,
 			proc_names);
 
 	return (0);
 }
 
-static int nfs_submit_nfs4_server (const char *instance, char **fields, 
+static int nfs_submit_nfs4_server (const char *instance, char **fields,
 		size_t fields_num)
 {
 	static int suppress_warning = 0;
 
 	if (fields_num != NFS4_SERVER40_NUM_PROC &&
-		fields_num != NFS4_SERVER41_NUM_PROC) 
+		fields_num != NFS4_SERVER41_NUM_PROC)
 	{
 		if (!suppress_warning)
 		{
@@ -466,7 +466,7 @@ static int nfs_submit_nfs4_server (const char *instance, char **fields,
 		}
 	}
 
-        nfs_submit_fields (4, instance, fields, 
+        nfs_submit_fields (4, instance, fields,
 			nfs4_server40_procedures_names_num,
 			nfs4_server40_procedures_names);
 
@@ -474,15 +474,15 @@ static int nfs_submit_nfs4_server (const char *instance, char **fields,
 	{
 		fields += nfs4_server40_procedures_names_num;
 
-	        nfs_submit_fields (4, instance, fields, 
-				nfs4_server41_procedures_names_num, 
+	        nfs_submit_fields (4, instance, fields,
+				nfs4_server41_procedures_names_num,
 				nfs4_server41_procedures_names);
 	}
 
 	return (0);
 }
 
-static int nfs_submit_nfs4_client (const char *instance, char **fields, 
+static int nfs_submit_nfs4_client (const char *instance, char **fields,
 		size_t fields_num)
 {
 	size_t proc40_names_num, proc41_names_num;
@@ -500,31 +500,21 @@ static int nfs_submit_nfs4_client (const char *instance, char **fields,
 			proc40_names_num = fields_num;
 			break;
 		case 40:
-			proc40_names_num = 35;
-			break;
 		case 41:
 			proc40_names_num = 35;
 			break;
 		case 42:
-			proc40_names_num = 36;
-			break;
 		case 44:
 			proc40_names_num = 36;
 			break;
 		case 46:
-			proc40_names_num = 36;
-			break;
 		case 47:
-			proc40_names_num = 36;
-			break;
 		case 51:
-			proc40_names_num = 36;
-			break;
 		case 53:
-			proc40_names_num = 36;
+			proc40_names_num = 37;
 			break;
 		case 54:
-			proc40_names_num = 37;
+			proc40_names_num = 38;
 			break;
 		default:
 			if (!suppress_warning)
@@ -564,7 +554,7 @@ static int nfs_submit_nfs4_client (const char *instance, char **fields,
 	return (0);
 }
 
-static void nfs_read_linux (FILE *fh, char *inst)
+static void nfs_read_linux (FILE *fh, const char *inst)
 {
 	char buffer[1024];
 
@@ -599,21 +589,21 @@ static void nfs_read_linux (FILE *fh, char *inst)
 		else if (strcmp (fields[0], "proc4ops") == 0)
 		{
 			if (inst[0] == 's')
-				nfs_submit_nfs4_server (inst, fields + 2, 
+				nfs_submit_nfs4_server (inst, fields + 2,
 						(size_t) (fields_num - 2));
 		}
 		else if (strcmp (fields[0], "proc4") == 0)
 		{
 			if (inst[0] == 'c')
 				nfs_submit_nfs4_client (inst, fields + 2,
-						(size_t) (fields_num - 2));			
+						(size_t) (fields_num - 2));
 		}
 	} /* while (fgets) */
 } /* void nfs_read_linux */
 #endif /* KERNEL_LINUX */
 
 #if HAVE_LIBKSTAT
-static int nfs_read_kstat (kstat_t *ksp, int nfs_version, char *inst,
+static int nfs_read_kstat (kstat_t *ksp, int nfs_version, const char *inst,
 		char const **proc_names, size_t proc_names_num)
 {
 	char plugin_instance[DATA_MAX_NAME_LEN];