X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdisk.c;h=e7372ab7a42dd8c0087450facb973d91e02665a8;hb=8c086dac4095529e02530b28fd92e50ad296acce;hp=d2e9f9873ea71025a4185f6652b918474c5b0ddb;hpb=d2914ae1474b2d42120c65c3f48be0be7affcb4e;p=collectd.git

diff --git a/src/disk.c b/src/disk.c
index d2e9f987..e7372ab7 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -403,7 +403,7 @@ static int disk_read (void)
 		major = atoll (fields[0]);
 		minor = atoll (fields[1]);
 
-		disk_name = fields[2];
+		disk_name = fields[2 + fieldshift];
 
 		for (ds = disklist, pre_ds = disklist; ds != NULL; pre_ds = ds, ds = ds->next)
 			if (strcmp (disk_name, ds->name) == 0)
@@ -562,9 +562,8 @@ static int disk_read (void)
 
 		if (is_disk)
 		{
-			if ((read_merged != -1LL) || (write_merged != -1LL))
-				disk_submit (disk_name, "disk_merged",
-						read_merged, write_merged);
+			disk_submit (disk_name, "disk_merged",
+					read_merged, write_merged);
 		} /* if (is_disk) */
 	} /* while (fgets (buffer, sizeof (buffer), fh) != NULL) */