From a9a56efc28e646ad7fa4c9a03de5b253ff15cdb0 Mon Sep 17 00:00:00 2001 From: "Costa Tsaousis (ktsaou)" Date: Sun, 11 Dec 2016 02:15:00 +0200 Subject: [PATCH] do not add iso9660 filesystems be default; fixes #1350 --- src/proc_diskstats.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/proc_diskstats.c b/src/proc_diskstats.c index c359d1cf..54369b37 100644 --- a/src/proc_diskstats.c +++ b/src/proc_diskstats.c @@ -129,7 +129,7 @@ struct mount_point_metadata { int do_inodes; }; -static inline void do_disk_space_stats(struct disk *d, const char *mount_point, const char *mount_source, const char *disk, const char *family, int update_every, unsigned long long dt) { +static inline void do_disk_space_stats(struct disk *d, const char *mount_point, const char *mount_source, const char *disk, const char *family, const char *filesystem, int update_every, unsigned long long dt) { (void)dt; static DICTIONARY *mount_points = NULL; @@ -172,6 +172,10 @@ static inline void do_disk_space_stats(struct disk *d, const char *mount_point, def_space = CONFIG_ONDEMAND_NO; def_inodes = CONFIG_ONDEMAND_NO; } + else if(unlikely(filesystem && !strcmp(filesystem, "iso9660"))) { + def_space = CONFIG_ONDEMAND_NO; + def_inodes = CONFIG_ONDEMAND_NO; + } do_space = config_get_boolean_ondemand(var_name, "space usage", def_space); do_inodes = config_get_boolean_ondemand(var_name, "inodes usage", def_inodes); @@ -868,7 +872,7 @@ int do_proc_diskstats(int update_every, unsigned long long dt) { // space metrics if(unlikely( d->mount_point && (d->do_space || d->do_inodes) )) { - do_disk_space_stats(d, d->mount_point, disk, disk, family, update_every, dt); + do_disk_space_stats(d, d->mount_point, disk, disk, family, NULL, update_every, dt); } */ } @@ -898,7 +902,7 @@ int do_proc_diskstats(int update_every, unsigned long long dt) { // fprintf(stderr, "Will process mount point '%s', source '%s', filesystem '%s'\n", mi->mount_point, mi->mount_source, mi->filesystem); */ - do_disk_space_stats(NULL, mi->mount_point, mi->mount_source, mi->persistent_id, mi->mount_point , update_every, dt); + do_disk_space_stats(NULL, mi->mount_point, mi->mount_source, mi->persistent_id, mi->mount_point, mi->filesystem, update_every, dt); } return 0; -- 2.39.2