Merge remote-tracking branch 'github/pr/387'

[collectd.git] / src / disk.c

diff --git a/src/disk.c b/src/disk.c
index 375583c432418dd355a4eafe753a849a0cc18ba2..36d0a0c3450cc46b46d8a5d3725dedbaad9c2231 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -109,7 +109,7 @@ static diskstats_t *disklist;
 /* #endif KERNEL_LINUX */
 
 #elif HAVE_LIBKSTAT
-#define MAX_NUMDISK 256
+#define MAX_NUMDISK 1024
 extern kstat_ctl_t *kc;
 static kstat_t *ksp[MAX_NUMDISK];
 static int numdisk = 0;
@@ -251,8 +251,9 @@ static void disk_submit (const char *plugin_instance,
 #if KERNEL_LINUX
 static counter_t disk_calc_time_incr (counter_t delta_time, counter_t delta_ops)
 {
+       double interval = CDTIME_T_TO_DOUBLE (plugin_get_interval ());
        double avg_time = ((double) delta_time) / ((double) delta_ops);
-       double avg_time_incr = CDTIME_T_TO_DOUBLE (interval_g) * avg_time;
+       double avg_time_incr = interval * avg_time;
 
        return ((counter_t) (avg_time_incr + .5));
 }