From: Florian Forster <octo@collectd.org>
Date: Sun, 23 Sep 2012 10:22:27 +0000 (+0200)
Subject: Merge branch 'collectd-5.0' into collectd-5.1
X-Git-Tag: collectd-5.1.1~7
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=80a66a53838bcf17e513f673f18a61fd1ac647c0;p=collectd.git

Merge branch 'collectd-5.0' into collectd-5.1
---

80a66a53838bcf17e513f673f18a61fd1ac647c0
diff --cc src/zfs_arc.c
index f4352ff4,f886c86a..046b7b02
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@@ -107,8 -77,18 +107,9 @@@ static void za_submit_ratio (const char
  
  static int za_read (void)
  {
 -	gauge_t  arc_size, l2_size;
 -	derive_t demand_data_hits,
 -		 demand_metadata_hits,
 -		 prefetch_data_hits,
 -		 prefetch_metadata_hits,
 -		 demand_data_misses,
 -		 demand_metadata_misses,
 -		 prefetch_data_misses,
 -		 prefetch_metadata_misses;
  	gauge_t  arc_hits, arc_misses, l2_hits, l2_misses;
  	value_t  l2_io[2];
+ 	kstat_t	 *ksp	= NULL;
  
  	get_kstat (&ksp, "zfs", 0, "arcstats");
  	if (ksp == NULL)