btrfs-progs: fi usage: cleanup, print header in one go
authorDavid Sterba <dsterba@suse.com>
Mon, 2 Nov 2015 17:32:04 +0000 (18:32 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 2 Nov 2015 17:39:41 +0000 (18:39 +0100)
Signed-off-by: David Sterba <dsterba@suse.com>
cmds-fi-usage.c

index a5a4936..65c16b8 100644 (file)
@@ -643,30 +643,19 @@ static void _cmd_filesystem_usage_tabular(unsigned unit_mode,
 
        /* header */
        for (i = 0, col = 1; i < sargs->total_spaces; i++) {
-               const char *description;
                u64 flags = sargs->spaces[i].flags;
 
                if (flags & BTRFS_SPACE_INFO_GLOBAL_RSV)
                        continue;
 
-               description = btrfs_group_type_str(flags);
-
-               table_printf(matrix, col++, 0, "<%s", description);
+               table_printf(matrix, col, 0, "<%s",
+                               btrfs_group_type_str(flags));
+               table_printf(matrix, col, 1, "<%s",
+                               btrfs_group_profile_str(flags));
+               col++;
        }
        unallocated_col = col;
 
-       for (i = 0, col = 1; i < sargs->total_spaces; i++) {
-               const char *r_mode;
-               u64 flags = sargs->spaces[i].flags;
-
-               if (flags & BTRFS_SPACE_INFO_GLOBAL_RSV)
-                       continue;
-
-               r_mode = btrfs_group_profile_str(flags);
-
-               table_printf(matrix, col++, 1, "<%s", r_mode);
-       }
-
        table_printf(matrix, unallocated_col, 1, "<Unallocated");
 
        /* body */