X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=ad287bb107eed0e9e50b2974e95349a779f9d9b2;hb=04f27bdd38966e0b826b283d8790ce31fb467929;hp=e2d2da4c5deb321319c19d8e09b23984cd7fce1a;hpb=e14e8b7f5c5bf9d0fe5cc632c6383f304d4ac2ad;p=collectd.git

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index e2d2da4c..ad287bb1 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -145,7 +145,6 @@ static void za_submit (const char* type, const char* type_instance, value_t* val
 	vl.values = values;
 	vl.values_len = values_len;
 
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "zfs_arc", sizeof (vl.plugin));
 	sstrncpy (vl.type, type, sizeof (vl.type));
 	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
@@ -204,7 +203,6 @@ static void za_submit_ratio (const char* type_instance, gauge_t hits, gauge_t mi
 static int za_read (void)
 {
 	gauge_t  arc_hits, arc_misses, l2_hits, l2_misses;
-	value_t  l2_io[2];
 	kstat_t	 *ksp	= NULL;
 
 #if defined(KERNEL_LINUX)
@@ -320,10 +318,11 @@ static int za_read (void)
 	za_submit_ratio ("L2", l2_hits, l2_misses);
 
 	/* I/O */
-	l2_io[0].derive = get_zfs_value(ksp, "l2_read_bytes");
-	l2_io[1].derive = get_zfs_value(ksp, "l2_write_bytes");
-
-	za_submit ("io_octets", "L2", l2_io, /* num values = */ 2);
+	value_t  l2_io[] = {
+		{ .derive = (derive_t) get_zfs_value(ksp, "l2_read_bytes") },
+		{ .derive = (derive_t) get_zfs_value(ksp, "l2_write_bytes") },
+	};
+	za_submit ("io_octets", "L2", l2_io, STATIC_ARRAY_SIZE (l2_io));
 
 #if defined(KERNEL_LINUX)
 	free_zfs_values (ksp);