projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
92c3b2e
)
disk plugin: Fix regression after #2955 (Drop support for Linux 2.4)
author
Pavel Rochnyack
<pavel2000@ngs.ru>
Tue, 30 Oct 2018 14:53:11 +0000
(21:53 +0700)
committer
Pavel Rochnyack
<pavel2000@ngs.ru>
Tue, 30 Oct 2018 14:59:19 +0000
(21:59 +0700)
Issue: #2955
src/disk.c
patch
|
blob
|
history
diff --git
a/src/disk.c
b/src/disk.c
index
c78df4e
..
b2285c1
100644
(file)
--- a/
src/disk.c
+++ b/
src/disk.c
@@
-662,9
+662,6
@@
static int disk_read(void) {
char buffer[1024];
char *fields[32];
char buffer[1024];
char *fields[32];
- int numfields;
-
- int minor = 0;
derive_t read_sectors = 0;
derive_t write_sectors = 0;
derive_t read_sectors = 0;
derive_t write_sectors = 0;
@@
-691,14
+688,12
@@
static int disk_read(void) {
char *disk_name;
char *output_name;
char *disk_name;
char *output_name;
- numfields = strsplit(buffer, fields, 32);
+
int
numfields = strsplit(buffer, fields, 32);
/* need either 7 fields (partition) or at least 14 fields */
if ((numfields != 7) && (numfields < 14))
continue;
/* need either 7 fields (partition) or at least 14 fields */
if ((numfields != 7) && (numfields < 14))
continue;
- minor = atoll(fields[1]);
-
disk_name = fields[2];
for (ds = disklist, pre_ds = disklist; ds != NULL;
disk_name = fields[2];
for (ds = disklist, pre_ds = disklist; ds != NULL;
@@
-736,18
+731,16
@@
static int disk_read(void) {
read_sectors = atoll(fields[5]);
write_sectors = atoll(fields[9]);
read_sectors = atoll(fields[5]);
write_sectors = atoll(fields[9]);
- if (minor == 0) {
- is_disk = 1;
- read_merged = atoll(fields[4]);
- read_time = atoll(fields[6]);
- write_merged = atoll(fields[8]);
- write_time = atoll(fields[10]);
+ is_disk = 1;
+ read_merged = atoll(fields[4]);
+ read_time = atoll(fields[6]);
+ write_merged = atoll(fields[8]);
+ write_time = atoll(fields[10]);
-
in_progress = atof(fields[11]);
+ in_progress = atof(fields[11]);
- io_time = atof(fields[12]);
- weighted_time = atof(fields[13]);
- }
+ io_time = atof(fields[12]);
+ weighted_time = atof(fields[13]);
}
{
}
{