Merge branch 'collectd-5.4' into collectd-5.5

[collectd.git] / src / nfs.c

diff --git a/src/nfs.c b/src/nfs.c
index c466439..4285d76 100644 (file)
--- 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 */
@@ -500,31 +500,20 @@ 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)