From f690ec69f180f9931df65b6a9d550fa34d7036c1 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 25 Sep 2017 09:28:34 +0200 Subject: [PATCH] zfs_arc plugin: Avoid resetting global variables from init(). Fixes: #973 --- src/zfs_arc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/zfs_arc.c b/src/zfs_arc.c index 3ef3e562..e589184c 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -35,6 +35,10 @@ /* * Global variables */ +static value_to_rate_state_t arc_hits_state; +static value_to_rate_state_t arc_misses_state; +static value_to_rate_state_t l2_hits_state; +static value_to_rate_state_t l2_misses_state; #if defined(KERNEL_LINUX) #include "utils_llist.h" @@ -188,9 +192,6 @@ static void za_submit_ratio(const char *type_instance, gauge_t hits, za_submit_gauge("cache_ratio", type_instance, ratio); } -static value_to_rate_state_t arc_hits_state, arc_misses_state, l2_hits_state, - l2_misses_state; - static int za_read(void) { gauge_t arc_hits, arc_misses, l2_hits, l2_misses; kstat_t *ksp = NULL; @@ -361,11 +362,6 @@ static int za_init(void) /* {{{ */ } #endif - memset(&arc_hits_state, 0, sizeof(arc_hits_state)); - memset(&arc_misses_state, 0, sizeof(arc_misses_state)); - memset(&l2_hits_state, 0, sizeof(l2_hits_state)); - memset(&l2_misses_state, 0, sizeof(l2_misses_state)); - return 0; } /* }}} int za_init */ -- 2.11.0