projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disk plugin: Use correct name under Linux 2.4
[collectd.git]
/
src
/
disk.c
diff --git
a/src/disk.c
b/src/disk.c
index
d2e9f98
..
e7372ab
100644
(file)
--- 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]);
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)
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 (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) */
} /* if (is_disk) */
} /* while (fgets (buffer, sizeof (buffer), fh) != NULL) */