X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=53bc4a895e1123f0966eb743723cd6c1d607c375;hb=218c57128f2e54960133cff3e774b5ef9944068a;hp=3d5a402c7949b8741b7568b78d987c1fe033dc6a;hpb=1ec46a6e59cb17f11633a0c07865c2e9e44d374e;p=collectd.git

diff --git a/src/df.c b/src/df.c
index 3d5a402c..53bc4a89 100644
--- a/src/df.c
+++ b/src/df.c
@@ -17,7 +17,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * Authors:
- *   Florian octo Forster <octo at verplant.org>
+ *   Florian octo Forster <octo at collectd.org>
  *   Paul Sadauskas <psadauskas at gmail.com>
  **/
 
@@ -53,7 +53,6 @@ static const char *config_keys[] =
 	"FSType",
 	"IgnoreSelected",
 	"ReportByDevice",
-	"ReportReserved",
 	"ReportInodes",
 	"ValuesAbsolute",
 	"ValuesPercentage"
@@ -204,20 +203,43 @@ static int df_read (void)
 	{
 		unsigned long long blocksize;
 		char disk_name[256];
+		cu_mount_t *dup_ptr;
 		uint64_t blk_free;
 		uint64_t blk_reserved;
 		uint64_t blk_used;
 
-		if (ignorelist_match (il_device,
-					(mnt_ptr->spec_device != NULL)
-					? mnt_ptr->spec_device
-					: mnt_ptr->device))
+		char const *dev = (mnt_ptr->spec_device != NULL)
+			? mnt_ptr->spec_device
+			: mnt_ptr->device;
+
+		if (ignorelist_match (il_device, dev))
 			continue;
 		if (ignorelist_match (il_mountpoint, mnt_ptr->dir))
 			continue;
 		if (ignorelist_match (il_fstype, mnt_ptr->type))
 			continue;
 
+		/* search for duplicates *in front of* the current mnt_ptr. */
+		for (dup_ptr = mnt_list; dup_ptr != NULL; dup_ptr = dup_ptr->next)
+		{
+			/* No duplicate found: mnt_ptr is the first of its kind. */
+			if (dup_ptr == mnt_ptr)
+			{
+				dup_ptr = NULL;
+				break;
+			}
+
+			/* Duplicate found: leave non-NULL dup_ptr. */
+			if (by_device && (strcmp (mnt_ptr->spec_device, dup_ptr->spec_device) == 0))
+				break;
+			else if (!by_device && (strcmp (mnt_ptr->dir, dup_ptr->dir) == 0))
+				break;
+		}
+
+		/* ignore duplicates */
+		if (dup_ptr != NULL)
+			continue;
+
 		if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
 		{
 			char errbuf[1024];
@@ -234,10 +256,10 @@ static int df_read (void)
 		if (by_device)
 		{
 			/* eg, /dev/hda1  -- strip off the "/dev/" */
-			if (strncmp (mnt_ptr->spec_device, "/dev/", strlen ("/dev/")) == 0)
-				sstrncpy (disk_name, mnt_ptr->spec_device + strlen ("/dev/"), sizeof (disk_name));
+			if (strncmp (dev, "/dev/", strlen ("/dev/")) == 0)
+				sstrncpy (disk_name, dev + strlen ("/dev/"), sizeof (disk_name));
 			else
-				sstrncpy (disk_name, mnt_ptr->spec_device, sizeof (disk_name));
+				sstrncpy (disk_name, dev, sizeof (disk_name));
 
 			if (strlen(disk_name) < 1)
 			{
@@ -320,7 +342,7 @@ static int df_read (void)
 		}
 
 		/* inode handling */
-		if (report_inodes)
+		if (report_inodes && statbuf.f_files != 0 && statbuf.f_ffree != 0)
 		{
 			uint64_t inode_free;
 			uint64_t inode_reserved;