X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=inline;f=src%2Fdf.c;h=2c59b01c63e7f5a5e65163f4e1278609fbec8a17;hb=a9d3d970d5add3798d46c81b35ffe4ed17dea320;hp=26d23826fccf32c81420f417192956737f64bdc8;hpb=d3fc6d0831a63af2e96300f488a9f8f5fc3183fb;p=collectd.git diff --git a/src/df.c b/src/df.c index 26d23826..2c59b01c 100644 --- a/src/df.c +++ b/src/df.c @@ -124,7 +124,6 @@ static void df_submit (char *df_name, vl.values = values; vl.values_len = 2; - vl.time = time (NULL); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "df", sizeof (vl.plugin)); sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance)); @@ -156,22 +155,6 @@ static int df_read (void) for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next) { - if (STATANYFS (mnt_ptr->dir, &statbuf) < 0) - { - char errbuf[1024]; - ERROR ("statv?fs failed: %s", - sstrerror (errno, errbuf, - sizeof (errbuf))); - continue; - } - - if (!statbuf.f_blocks) - continue; - - blocksize = BLOCKSIZE(statbuf); - df_free = statbuf.f_bfree * blocksize; - df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize; - if (strcmp (mnt_ptr->dir, "/") == 0) { sstrncpy (mnt_name, "root", sizeof (mnt_name)); @@ -198,6 +181,22 @@ static int df_read (void) if (ignorelist_match (il_fstype, mnt_ptr->type)) continue; + if (STATANYFS (mnt_ptr->dir, &statbuf) < 0) + { + char errbuf[1024]; + ERROR ("statv?fs failed: %s", + sstrerror (errno, errbuf, + sizeof (errbuf))); + continue; + } + + if (!statbuf.f_blocks) + continue; + + blocksize = BLOCKSIZE(statbuf); + df_free = statbuf.f_bfree * blocksize; + df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize; + df_submit (mnt_name, df_used, df_free); }