From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 18 Jan 2016 15:44:52 +0000 (+0100)
Subject: df: remove legacy code skipping "rootfs" monitoring
X-Git-Tag: collectd-5.5.1^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=573db6cb7d8904468546746117efbd989d4a5843;p=collectd.git

df: remove legacy code skipping "rootfs" monitoring

3512bb1 added code to skip duplicate reporting of `rootfs` mounted on `/`.
f9c1c5b and f0398d0 added generic code to skip any volume mounted twice.

Depending on the order of the entries in `/etc/mtab`, reporting for `/` was
entirely skipped.

This patch basically reverts the first, non-generic patch, as it's
superseded by the 2 others.

Fixes #1402

Signed-off-by: Florian Forster <octo@collectd.org>
---

diff --git a/src/df.c b/src/df.c
index d99af4bb..f3bc7e42 100644
--- a/src/df.c
+++ b/src/df.c
@@ -270,11 +270,7 @@ static int df_read (void)
 		else
 		{
 			if (strcmp (mnt_ptr->dir, "/") == 0)
-			{
-				if (strcmp (mnt_ptr->type, "rootfs") == 0)
-					continue;
 				sstrncpy (disk_name, "root", sizeof (disk_name));
-			}
 			else
 			{
 				int i, len;