X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=ce1ef107534a8963207d7384dca80e50ebeba275;hb=bf90793e82989b1c36fe8f3b66b9c9fe05c9532d;hp=26d23826fccf32c81420f417192956737f64bdc8;hpb=148e8732e45435a051df1c3673cad0d5dc77492f;p=collectd.git

diff --git a/src/df.c b/src/df.c
index 26d23826..ce1ef107 100644
--- a/src/df.c
+++ b/src/df.c
@@ -124,11 +124,10 @@ 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));
-	sstrncpy (vl.type, "df", sizeof (vl.host));
+	sstrncpy (vl.type, "df", sizeof (vl.type));
 	sstrncpy (vl.type_instance, df_name, sizeof (vl.type_instance));
 
 	plugin_dispatch_values (&vl);
@@ -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);
 	}