X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=cf858f8f55867c44f2b82b083187d982748600fb;hb=b165cd13cd30a30ac830df1f6f6fbd52474a6f64;hp=aff02b62ccc390a6d000f355063f39f59c701bc2;hpb=2412d3ca76f7ac24e67543720c1d385188da0ce3;p=collectd.git diff --git a/src/zfs_arc.c b/src/zfs_arc.c index aff02b62..cf858f8f 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -75,11 +75,11 @@ static long long get_zfs_value(kstat_t *ksp, const char *key) { e = llist_search(ksp, key); if (e == NULL) { - return (-1); + return -1; } v = e->value; - return ((long long)v->derive); + return (long long)v->derive; } static void free_zfs_values(kstat_t *ksp) { @@ -99,7 +99,7 @@ extern kstat_ctl_t *kc; static long long get_zfs_value(kstat_t *ksp, char *name) { - return (get_kstat_value(ksp, name)); + return get_kstat_value(ksp, name); } #elif defined(KERNEL_FREEBSD) #include @@ -122,9 +122,9 @@ static long long get_zfs_value(kstat_t *dummy __attribute__((unused)), rv = sysctlbyname(buffer, (void *)&value, &valuelen, /* new value = */ NULL, /* new length = */ (size_t)0); if (rv == 0) - return (value); + return value; - return (-1); + return -1; } #endif @@ -152,12 +152,12 @@ static int za_read_derive(kstat_t *ksp, const char *kstat_value, long long tmp = get_zfs_value(ksp, (char *)kstat_value); if (tmp == -1LL) { DEBUG("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value); - return (-1); + return -1; } za_submit(type, type_instance, &(value_t){.derive = (derive_t)tmp}, /* values_num = */ 1); - return (0); + return 0; } static int za_read_gauge(kstat_t *ksp, const char *kstat_value, @@ -165,12 +165,12 @@ static int za_read_gauge(kstat_t *ksp, const char *kstat_value, long long tmp = get_zfs_value(ksp, (char *)kstat_value); if (tmp == -1LL) { DEBUG("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value); - return (-1); + return -1; } za_submit(type, type_instance, &(value_t){.gauge = (gauge_t)tmp}, /* values_num = */ 1); - return (0); + return 0; } static void za_submit_ratio(const char *type_instance, gauge_t hits, @@ -201,14 +201,14 @@ static int za_read(void) { char errbuf[1024]; ERROR("zfs_arc plugin: Opening \"%s\" failed: %s", ZOL_ARCSTATS_FILE, sstrerror(errno, errbuf, sizeof(errbuf))); - return (-1); + return -1; } ksp = llist_create(); if (ksp == NULL) { ERROR("zfs_arc plugin: `llist_create' failed."); fclose(fh); - return (-1); + return -1; } // Ignore the first two lines because they contain information about @@ -218,12 +218,12 @@ static int za_read(void) { if (fgets(buffer, sizeof(buffer), fh) == NULL) { ERROR("zfs_arc plugin: \"%s\" does not contain a single line.", ZOL_ARCSTATS_FILE); fclose(fh); - return (-1); + return -1; } if (fgets(buffer, sizeof(buffer), fh) == NULL) { ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.", ZOL_ARCSTATS_FILE); fclose(fh); - return (-1); + return -1; } while (fgets(buffer, sizeof(buffer), fh) != NULL) { @@ -248,7 +248,7 @@ static int za_read(void) { get_kstat(&ksp, "zfs", 0, "arcstats"); if (ksp == NULL) { ERROR("zfs_arc plugin: Cannot find zfs:0:arcstats kstat."); - return (-1); + return -1; } #endif @@ -331,7 +331,7 @@ static int za_read(void) { free_zfs_values(ksp); #endif - return (0); + return 0; } /* int za_read */ static int za_init(void) /* {{{ */ @@ -341,11 +341,11 @@ static int za_init(void) /* {{{ */ * went fine. */ if (kc == NULL) { ERROR("zfs_arc plugin: kstat chain control structure not available."); - return (-1); + return -1; } #endif - return (0); + return 0; } /* }}} int za_init */ void module_register(void) {