X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnfs.c;h=4285d765e6ebfe9ddbb42854d8808328e08c6503;hb=e4fe9b4d69c69d922cad1272104fdb8de5c24faf;hp=ac211655576166fc94531b4abbd6f3fe6eff49b2;hpb=64446a66feadac472d4f073eadc245a4de8bc1b6;p=collectd.git

diff --git a/src/nfs.c b/src/nfs.c
index ac211655..4285d765 100644
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -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 */
@@ -492,37 +492,28 @@ static int nfs_submit_nfs4_client (const char *instance, char **fields,
 	switch (fields_num)
 	{
 		case 34:
-			proc40_names_num = 34;
-			break;
 		case 35:
-			proc40_names_num = 35;
+		case 36:
+		case 37:
+		case 38:
+			/* 4.0-only configuration */
+			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)