X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=cb0ff2ffe2ba5bfcefb046c0502021b27f4411c6;hb=79593ed5e0a3def8e91be5b1de15a536af2d4a92;hp=3d5a402c7949b8741b7568b78d987c1fe033dc6a;hpb=61bda3c7438f57086b0fcf87cc54407efcbaf9e3;p=collectd.git

diff --git a/src/df.c b/src/df.c
index 3d5a402c..cb0ff2ff 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>
  **/
 
@@ -208,10 +208,11 @@ static int df_read (void)
 		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;
@@ -234,10 +235,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 +321,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;