From: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Date: Mon, 1 Aug 2011 11:50:52 +0000 (+0000)
Subject: df plugin: skip duplicate entries, fixes "uc_update: Value too old" error
X-Git-Tag: collectd-5.5.1~31^2~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f9c1c5b;p=collectd.git

df plugin: skip duplicate entries, fixes "uc_update: Value too old" error

Issue: #1402
---

diff --git a/src/df.c b/src/df.c
index 3b0c995b..3f9eabda 100644
--- a/src/df.c
+++ b/src/df.c
@@ -204,6 +204,7 @@ static int df_read (void)
 	{
 		unsigned long long blocksize;
 		char disk_name[256];
+        cu_mount_t *mnt_dup_ptr;
 		uint64_t blk_free;
 		uint64_t blk_reserved;
 		uint64_t blk_used;
@@ -219,6 +220,20 @@ static int df_read (void)
 		if (ignorelist_match (il_fstype, mnt_ptr->type))
 			continue;
 
+		/* ignore duplicates */
+		for (mnt_dup_ptr = mnt_ptr; mnt_dup_ptr != NULL; mnt_dup_ptr = mnt_dup_ptr->next)
+		{
+			if (by_device) {
+				if (strcmp (mnt_ptr->spec_device, mnt_dup_ptr->spec_device) == 0)
+					continue;
+			}
+			else
+			{
+				if (strcmp (mnt_ptr->dir, mnt_dup_ptr->dir) == 0)
+					continue;
+			}
+		}
+
 		if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
 		{
 			char errbuf[1024];