X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdisk.c;h=8830403ea60b8533211e7f2c2475d4967f20e362;hb=b99f2ef5c262080cdd55d4dc056aaf23ba2ff907;hp=9c8d1e593878fab256f433d9172b38b3de8e5329;hpb=ac7a3cde14b20bdb12a9ab0a9aad25dae0a23ac3;p=collectd.git

diff --git a/src/disk.c b/src/disk.c
index 9c8d1e59..8830403e 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -794,7 +794,7 @@ static int disk_read (void)
 			disk_submit (output_name, "disk_merged",
 					read_merged, write_merged);
 			submit_in_progress (output_name, in_progress);
-			submit_io_time (io_time, weighted_time);
+			submit_io_time (output_name, io_time, weighted_time);
 		} /* if (is_disk) */
 
 		/* release udev-based alternate name, if allocated */
@@ -859,7 +859,12 @@ static int disk_read (void)
 
 #elif defined(HAVE_LIBSTATGRAB)
 	sg_disk_io_stats *ds;
-	int disks, counter;
+# if HAVE_LIBSTATGRAB_0_90
+	size_t disks;
+# else
+	int disks;
+#endif
+	int counter;
 	char name[DATA_MAX_NAME_LEN];
 	
 	if ((ds = sg_get_disk_io_stats(&disks)) == NULL)