collectd-python.conf(5): fix trivial spelling mistakes

[collectd.git] / src / df.c

diff --git a/src/df.c b/src/df.c
index 2e9b2ae..dc7be1e 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -257,6 +257,8 @@ static int df_read (void)
                {
                        if (strcmp (mnt_ptr->dir, "/") == 0)
                        {
+                               if (strcmp (mnt_ptr->type, "rootfs") == 0)
+                                       continue;
                                sstrncpy (disk_name, "root", sizeof (disk_name));
                        }
                        else
@@ -280,7 +282,24 @@ static int df_read (void)
                        uint64_t blk_reserved;
                        uint64_t blk_used;
 
-                       /* Sanity-check for the values in the struct */
+                       /*
+                        * Sanity-check for the values in the struct
+                        */
+                       /* Check for negative "available" byes. For example UFS can
+                        * report negative free space for user. Notice. blk_reserved
+                        * will start to diminish after this. */
+#if HAVE_STATVFS
+                       /* Cast and temporary variable are needed to avoid
+                        * compiler warnings.
+                        * ((struct statvfs).f_bavail is unsigned (POSIX)) */
+                       int64_t signed_bavail = (int64_t) statbuf.f_bavail;
+                       if (signed_bavail < 0)
+                               statbuf.f_bavail = 0;
+#elif HAVE_STATFS
+                       if (statbuf.f_bavail < 0)
+                               statbuf.f_bavail = 0;
+#endif
+                       /* Make sure that f_blocks >= f_bfree >= f_bavail */
                        if (statbuf.f_bfree < statbuf.f_bavail)
                                statbuf.f_bfree = statbuf.f_bavail;
                        if (statbuf.f_blocks < statbuf.f_bfree)