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

diff --git a/src/df.c b/src/df.c
index 540985d7..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)
 			{
@@ -304,23 +305,23 @@ static int df_read (void)
 			df_submit_one (disk_name, "df_complex", "used",
 				(gauge_t) (blk_used * blocksize));
 		}
-		
+
 		if (values_percentage)
 		{
 			if (statbuf.f_blocks > 0)
 				{
-				df_submit_one (disk_name, "df_complex_pct", "free",
+				df_submit_one (disk_name, "percent_bytes", "free",
 					(gauge_t) ((float_t)(blk_free) / statbuf.f_blocks * 100));
-				df_submit_one (disk_name, "df_complex_pct", "reserved",
+				df_submit_one (disk_name, "percent_bytes", "reserved",
 					(gauge_t) ((float_t)(blk_reserved) / statbuf.f_blocks * 100));
-				df_submit_one (disk_name, "df_complex_pct", "used",
+				df_submit_one (disk_name, "percent_bytes", "used",
 					(gauge_t) ((float_t)(blk_used) / statbuf.f_blocks * 100));
 				}
 			else return (-1);
 		}
-		
+
 		/* inode handling */
-		if (report_inodes)
+		if (report_inodes && statbuf.f_files != 0 && statbuf.f_ffree != 0)
 		{
 			uint64_t inode_free;
 			uint64_t inode_reserved;
@@ -331,7 +332,7 @@ static int df_read (void)
 				statbuf.f_ffree = statbuf.f_favail;
 			if (statbuf.f_files < statbuf.f_ffree)
 				statbuf.f_files = statbuf.f_ffree;
-				
+
 			inode_free = (uint64_t) statbuf.f_favail;
 			inode_reserved = (uint64_t) (statbuf.f_ffree - statbuf.f_favail);
 			inode_used = (uint64_t) (statbuf.f_files - statbuf.f_ffree);
@@ -340,11 +341,11 @@ static int df_read (void)
 			{
 				if (statbuf.f_files > 0)
 				{
-					df_submit_one (disk_name, "df_inodes_pct", "free",
+					df_submit_one (disk_name, "percent_inodes", "free",
 						(gauge_t) ((float_t)(inode_free) / statbuf.f_files * 100));
-					df_submit_one (disk_name, "df_inodes_pct", "reserved",
+					df_submit_one (disk_name, "percent_inodes", "reserved",
 						(gauge_t) ((float_t)(inode_reserved) / statbuf.f_files * 100));
-					df_submit_one (disk_name, "df_inodes_pct", "used",
+					df_submit_one (disk_name, "percent_inodes", "used",
 						(gauge_t) ((float_t)(inode_used) / statbuf.f_files * 100));
 				}
 				else return (-1);