projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.0
[collectd.git]
/
src
/
zfs_arc.c
diff --git
a/src/zfs_arc.c
b/src/zfs_arc.c
index
bc2b0d2
..
f886c86
100644
(file)
--- a/
src/zfs_arc.c
+++ b/
src/zfs_arc.c
@@
-26,7
+26,7
@@
/*
* Global variables
*/
/*
* Global variables
*/
-static kstat_t *ksp;
+
extern kstat_ctl_t *kc;
static void za_submit (const char* type, const char* type_instance, value_t* values, int values_len)
extern kstat_ctl_t *kc;
static void za_submit (const char* type, const char* type_instance, value_t* values, int values_len)
@@
-86,8
+86,9
@@
static int za_read (void)
demand_metadata_misses,
prefetch_data_misses,
prefetch_metadata_misses;
demand_metadata_misses,
prefetch_data_misses,
prefetch_metadata_misses;
- gauge_t arc_hits, arc_misses,
arc_ratio, l2_hits, l2_misses, l2_ratio
;
+ gauge_t arc_hits, arc_misses,
l2_hits, l2_misses
;
value_t l2_io[2];
value_t l2_io[2];
+ kstat_t *ksp = NULL;
get_kstat (&ksp, "zfs", 0, "arcstats");
if (ksp == NULL)
get_kstat (&ksp, "zfs", 0, "arcstats");
if (ksp == NULL)
@@
-144,8
+145,6
@@
static int za_read (void)
static int za_init (void) /* {{{ */
{
static int za_init (void) /* {{{ */
{
- ksp = NULL;
-
/* kstats chain already opened by update_kstat (using *kc), verify everything went fine. */
if (kc == NULL)
{
/* kstats chain already opened by update_kstat (using *kc), verify everything went fine. */
if (kc == NULL)
{