df: do "rootfs" check sooner
authorDenys Vlasenko <vda.linux@googlemail.com>
Fri, 23 Feb 2018 16:08:32 +0000 (17:08 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Fri, 23 Feb 2018 16:08:32 +0000 (17:08 +0100)
function                                             old     new   delta
df_main                                             1065    1064      -1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
coreutils/df.c

index 1ed09d015c97bb437f77366542e19fb160b20f97..50dccac527e28476c239cba4c036c5aac01daf51 100644 (file)
@@ -206,6 +206,11 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                }
 
                device = mount_entry->mnt_fsname;
+
+               /* GNU coreutils 6.10 skips certain mounts, try to be compatible */
+               if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(device, "rootfs") == 0)
+                       continue;
+
                mount_point = mount_entry->mnt_dir;
                fs_type = mount_entry->mnt_type;
 
@@ -245,10 +250,6 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                                blocks_percent_used = u / (unsigned)blocks_total;
                        }
 
-                       /* GNU coreutils 6.10 skips certain mounts, try to be compatible.  */
-                       if (ENABLE_FEATURE_SKIP_ROOTFS && strcmp(device, "rootfs") == 0)
-                               continue;
-
 #ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY
                        if (strcmp(device, "/dev/root") == 0) {
                                /* Adjusts device to be the real root device,