X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnfs.c;h=0948bc79a6534f23a39c2d305b3b4869d0cd5204;hb=db35efb33e81d0a013e09a8a6ffa362ad5962f7c;hp=a921a1774d9cdcc1a0fa95fbfb44c77f17077a77;hpb=3e16fd0635e02f4e6d680d003ad653841bca8523;p=collectd.git diff --git a/src/nfs.c b/src/nfs.c index a921a177..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", @@ -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; @@ -589,14 +589,14 @@ static void nfs_read_linux (FILE *fh, const 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 */