Code

Merge branch 'collectd-5.0' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Sun, 23 Sep 2012 10:22:27 +0000 (12:22 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 23 Sep 2012 10:22:27 +0000 (12:22 +0200)
1  2 
configure.in
src/zfs_arc.c

diff --cc configure.in
Simple merge
diff --cc src/zfs_arc.c
index f4352ff48f60588b72a1ae83d337ba817ff09031,f886c86a60151da3d44ee327974295a03d8e6c8e..046b7b02120953c65d66de9c27dd2ff5ac482e8c
@@@ -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)