Merge branch 'collectd-4.10' into collectd-5.0

[collectd.git] / src / df.c

diff --git a/src/df.c b/src/df.c
index 371a7fc..ded374b 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -228,6 +228,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
@@ -252,9 +254,11 @@ static int df_read (void)
                 * report negative free space for user. Notice. blk_reserved
                 * will start to diminish after this. */
 #if HAVE_STATVFS
-               /* Cast is needed to avoid compiler warnings.
+               /* Cast and temporary variable are needed to avoid
+                * compiler warnings.
                 * ((struct statvfs).f_bavail is unsigned (POSIX)) */
-               if (((int64_t) statbuf.f_bavail) < 0)
+               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)