ext4: Display the mballoc flags in mb_history in hex instead of decimal

Displaying the flags in base 16 makes it easier to see which flags
have been set.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 9714db393efe8a1b6fa2ff0b2e7cf36fb7ecc199..e267727cc62d753108dfb1b8fca27c6784523d32 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -67,27 +67,27 @@ typedef unsigned int ext4_group_t;
 
 
 /* prefer goal again. length */
-#define EXT4_MB_HINT_MERGE             1
+#define EXT4_MB_HINT_MERGE             0x0001
 /* blocks already reserved */
-#define EXT4_MB_HINT_RESERVED          2
+#define EXT4_MB_HINT_RESERVED          0x0002
 /* metadata is being allocated */
-#define EXT4_MB_HINT_METADATA          4
+#define EXT4_MB_HINT_METADATA          0x0004
 /* first blocks in the file */
-#define EXT4_MB_HINT_FIRST             8
+#define EXT4_MB_HINT_FIRST             0x0008
 /* search for the best chunk */
-#define EXT4_MB_HINT_BEST              16
+#define EXT4_MB_HINT_BEST              0x0010
 /* data is being allocated */
-#define EXT4_MB_HINT_DATA              32
+#define EXT4_MB_HINT_DATA              0x0020
 /* don't preallocate (for tails) */
-#define EXT4_MB_HINT_NOPREALLOC                64
+#define EXT4_MB_HINT_NOPREALLOC                0x0040
 /* allocate for locality group */
-#define EXT4_MB_HINT_GROUP_ALLOC       128
+#define EXT4_MB_HINT_GROUP_ALLOC       0x0080
 /* allocate goal blocks or none */
-#define EXT4_MB_HINT_GOAL_ONLY         256
+#define EXT4_MB_HINT_GOAL_ONLY         0x0100
 /* goal is meaningful */
-#define EXT4_MB_HINT_TRY_GOAL          512
+#define EXT4_MB_HINT_TRY_GOAL          0x0200
 /* blocks already pre-reserved by delayed allocation */
-#define EXT4_MB_DELALLOC_RESERVED      1024
+#define EXT4_MB_DELALLOC_RESERVED      0x0400
 
 
 struct ext4_allocation_request {

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index d80b300c1779ef0621fb45740ebdd5882e0190db..3434c603432da495fdfa2cbda930e05e4babc557 100644 (file)
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2157,7 +2157,7 @@ static int ext4_mb_seq_history_show(struct seq_file *seq, void *v)
 
        if (v == SEQ_START_TOKEN) {
                seq_printf(seq, "%-5s %-8s %-23s %-23s %-23s %-5s "
-                               "%-5s %-2s %-5s %-5s %-5s %-6s\n",
+                               "%-5s %-2s %-6s %-5s %-5s %-6s\n",
                          "pid", "inode", "original", "goal", "result", "found",
                           "grps", "cr", "flags", "merge", "tail", "broken");
                return 0;
@@ -2165,7 +2165,7 @@ static int ext4_mb_seq_history_show(struct seq_file *seq, void *v)
 
        if (hs->op == EXT4_MB_HISTORY_ALLOC) {
                fmt = "%-5u %-8u %-23s %-23s %-23s %-5u %-5u %-2u "
-                       "%-5u %-5s %-5u %-6u\n";
+                       "0x%04x %-5s %-5u %-6u\n";
                sprintf(buf2, "%u/%d/%u@%u", hs->result.fe_group,
                        hs->result.fe_start, hs->result.fe_len,
                        hs->result.fe_logical);