silence-warnings-in-extent-status-tree-debugging-code

   1 ext4: silence warnings in extent status tree debugging code
   2
   3 From: Eric Whitney <enwlinux@gmail.com>
   4
   5 Adjust the conversion specifications in a few optionally compiled debug
   6 messages to match the return type of ext4_es_status().  Also, make a
   7 couple of minor grammatical message edits while we're at it.
   8
   9 Signed-off-by: Eric Whitney <enwlinux@gmail.com>
  10 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  11 ---
  12  fs/ext4/extents_status.c | 14 +++++++-------
  13  1 file changed, 7 insertions(+), 7 deletions(-)
  14
  15 diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
  16 index 0578b6b..9366b3a 100644
  17 --- a/fs/ext4/extents_status.c
  18 +++ b/fs/ext4/extents_status.c
  19 @@ -184,7 +184,7 @@ static void ext4_es_print_tree(struct inode *inode)
  20         while (node) {
  21                 struct extent_status *es;
  22                 es = rb_entry(node, struct extent_status, rb_node);
  23 -               printk(KERN_DEBUG " [%u/%u) %llu %llx",
  24 +               printk(KERN_DEBUG " [%u/%u) %llu %x",
  25                        es->es_lblk, es->es_len,
  26                        ext4_es_pblock(es), ext4_es_status(es));
  27                 node = rb_next(node);
  28 @@ -445,8 +445,8 @@ static void ext4_es_insert_extent_ext_check(struct inode *inode,
  29                                 pr_warn("ES insert assertion failed for "
  30                                         "inode: %lu we can find an extent "
  31                                         "at block [%d/%d/%llu/%c], but we "
  32 -                                       "want to add an delayed/hole extent "
  33 -                                       "[%d/%d/%llu/%llx]\n",
  34 +                                       "want to add a delayed/hole extent "
  35 +                                       "[%d/%d/%llu/%x]\n",
  36                                         inode->i_ino, ee_block, ee_len,
  37                                         ee_start, ee_status ? 'u' : 'w',
  38                                         es->es_lblk, es->es_len,
  39 @@ -486,8 +486,8 @@ static void ext4_es_insert_extent_ext_check(struct inode *inode,
  40                 if (!ext4_es_is_delayed(es) && !ext4_es_is_hole(es)) {
  41                         pr_warn("ES insert assertion failed for inode: %lu "
  42                                 "can't find an extent at block %d but we want "
  43 -                               "to add an written/unwritten extent "
  44 -                               "[%d/%d/%llu/%llx]\n", inode->i_ino,
  45 +                               "to add a written/unwritten extent "
  46 +                               "[%d/%d/%llu/%x]\n", inode->i_ino,
  47                                 es->es_lblk, es->es_lblk, es->es_len,
  48                                 ext4_es_pblock(es), ext4_es_status(es));
  49                 }
  50 @@ -524,7 +524,7 @@ static void ext4_es_insert_extent_ind_check(struct inode *inode,
  51                          */
  52                         pr_warn("ES insert assertion failed for inode: %lu "
  53                                 "We can find blocks but we want to add a "
  54 -                               "delayed/hole extent [%d/%d/%llu/%llx]\n",
  55 +                               "delayed/hole extent [%d/%d/%llu/%x]\n",
  56                                 inode->i_ino, es->es_lblk, es->es_len,
  57                                 ext4_es_pblock(es), ext4_es_status(es));
  58                         return;
  59 @@ -554,7 +554,7 @@ static void ext4_es_insert_extent_ind_check(struct inode *inode,
  60                 if (ext4_es_is_written(es)) {
  61                         pr_warn("ES insert assertion failed for inode: %lu "
  62                                 "We can't find the block but we want to add "
  63 -                               "an written extent [%d/%d/%llu/%llx]\n",
  64 +                               "a written extent [%d/%d/%llu/%x]\n",
  65                                 inode->i_ino, es->es_lblk, es->es_len,
  66                                 ext4_es_pblock(es), ext4_es_status(es));
  67                         return;