ext4_fix_up_ext4fs_debug_builds.patch

   1 ext4: fix up EXT4FS_DEBUG builds
   2
   3 From: Eric Sandeen <sandeen@redhat.com>
   4
   5 Builds with EXT4FS_DEBUG defined (to enable ext4_debug()) fail
   6 without these changes.  Clean up some format warnings too.
   7
   8 Signed-off-by: Eric Sandeen <sandeen@redhat.com>
   9 Signed-off-by: Mingming Cao <cmm@us.ibm.com>
  10 ---
  11
  12  fs/ext4/balloc.c |    6 +++---
  13  fs/ext4/ialloc.c |    2 +-
  14  fs/ext4/resize.c |   16 ++++++++--------
  15  3 files changed, 12 insertions(+), 12 deletions(-)
  16
  17
  18 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
  19 index 925e063..54d3da7 100644
  20 --- a/fs/ext4/balloc.c
  21 +++ b/fs/ext4/balloc.c
  22 @@ -1630,7 +1630,7 @@ ext4_fsblk_t ext4_new_blocks(handle_t *handle, struct inode *inode,
  23
  24         sbi = EXT4_SB(sb);
  25         es = EXT4_SB(sb)->s_es;
  26 -       ext4_debug("goal=%lu.\n", goal);
  27 +       ext4_debug("goal=%llu.\n", goal);
  28         /*
  29          * Allocate a block from reservation only when
  30          * filesystem is mounted with reservation(default,-o reservation), and
  31 @@ -1740,7 +1740,7 @@ retry_alloc:
  32
  33  allocated:
  34
  35 -       ext4_debug("using block group %d(%d)\n",
  36 +       ext4_debug("using block group %lu(%d)\n",
  37                         group_no, gdp->bg_free_blocks_count);
  38
  39         BUFFER_TRACE(gdp_bh, "get_write_access");
  40 @@ -1898,7 +1898,7 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb)
  41         brelse(bitmap_bh);
  42         printk("ext4_count_free_blocks: stored = %llu"
  43                 ", computed = %llu, %llu\n",
  44 -              EXT4_FREE_BLOCKS_COUNT(es),
  45 +               ext4_free_blocks_count(es),
  46                 desc_count, bitmap_count);
  47         return bitmap_count;
  48  #else
  49 diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
  50 index 17b5df1..575b521 100644
  51 --- a/fs/ext4/ialloc.c
  52 +++ b/fs/ext4/ialloc.c
  53 @@ -857,7 +857,7 @@ unsigned long ext4_count_free_inodes (struct super_block * sb)
  54                         continue;
  55
  56                 x = ext4_count_free(bitmap_bh, EXT4_INODES_PER_GROUP(sb) / 8);
  57 -               printk("group %d: stored = %d, counted = %lu\n",
  58 +               printk(KERN_DEBUG "group %lu: stored = %d, counted = %lu\n",
  59                         i, le16_to_cpu(gdp->bg_free_inodes_count), x);
  60                 bitmap_count += x;
  61         }
  62 diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
  63 index 7090c2d..4fbba60 100644
  64 --- a/fs/ext4/resize.c
  65 +++ b/fs/ext4/resize.c
  66 @@ -206,7 +206,7 @@ static int setup_new_group_blocks(struct super_block *sb,
  67         }
  68
  69         if (ext4_bg_has_super(sb, input->group)) {
  70 -               ext4_debug("mark backup superblock %#04lx (+0)\n", start);
  71 +               ext4_debug("mark backup superblock %#04llx (+0)\n", start);
  72                 ext4_set_bit(0, bh->b_data);
  73         }
  74
  75 @@ -215,7 +215,7 @@ static int setup_new_group_blocks(struct super_block *sb,
  76              i < gdblocks; i++, block++, bit++) {
  77                 struct buffer_head *gdb;
  78
  79 -               ext4_debug("update backup group %#04lx (+%d)\n", block, bit);
  80 +               ext4_debug("update backup group %#04llx (+%d)\n", block, bit);
  81
  82                 if ((err = extend_or_restart_transaction(handle, 1, bh)))
  83                         goto exit_bh;
  84 @@ -243,7 +243,7 @@ static int setup_new_group_blocks(struct super_block *sb,
  85              i < reserved_gdb; i++, block++, bit++) {
  86                 struct buffer_head *gdb;
  87
  88 -               ext4_debug("clear reserved block %#04lx (+%d)\n", block, bit);
  89 +               ext4_debug("clear reserved block %#04llx (+%d)\n", block, bit);
  90
  91                 if ((err = extend_or_restart_transaction(handle, 1, bh)))
  92                         goto exit_bh;
  93 @@ -256,10 +256,10 @@ static int setup_new_group_blocks(struct super_block *sb,
  94                 ext4_set_bit(bit, bh->b_data);
  95                 brelse(gdb);
  96         }
  97 -       ext4_debug("mark block bitmap %#04x (+%ld)\n", input->block_bitmap,
  98 +       ext4_debug("mark block bitmap %#04llx (+%llu)\n", input->block_bitmap,
  99                    input->block_bitmap - start);
 100         ext4_set_bit(input->block_bitmap - start, bh->b_data);
 101 -       ext4_debug("mark inode bitmap %#04x (+%ld)\n", input->inode_bitmap,
 102 +       ext4_debug("mark inode bitmap %#04llx (+%llu)\n", input->inode_bitmap,
 103                    input->inode_bitmap - start);
 104         ext4_set_bit(input->inode_bitmap - start, bh->b_data);
 105
 106 @@ -268,7 +268,7 @@ static int setup_new_group_blocks(struct super_block *sb,
 107              i < sbi->s_itb_per_group; i++, bit++, block++) {
 108                 struct buffer_head *it;
 109
 110 -               ext4_debug("clear inode block %#04lx (+%d)\n", block, bit);
 111 +               ext4_debug("clear inode block %#04llx (+%d)\n", block, bit);
 112
 113                 if ((err = extend_or_restart_transaction(handle, 1, bh)))
 114                         goto exit_bh;
 115 @@ -291,7 +291,7 @@ static int setup_new_group_blocks(struct super_block *sb,
 116         brelse(bh);
 117
 118         /* Mark unused entries in inode bitmap used */
 119 -       ext4_debug("clear inode bitmap %#04x (+%ld)\n",
 120 +       ext4_debug("clear inode bitmap %#04llx (+%llu)\n",
 121                    input->inode_bitmap, input->inode_bitmap - start);
 122         if (IS_ERR(bh = bclean(handle, sb, input->inode_bitmap))) {
 123                 err = PTR_ERR(bh);
 124 @@ -1054,7 +1054,7 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es,
 125         ext4_journal_dirty_metadata(handle, EXT4_SB(sb)->s_sbh);
 126         sb->s_dirt = 1;
 127         unlock_super(sb);
 128 -       ext4_debug("freeing blocks %lu through %llu\n", o_blocks_count,
 129 +       ext4_debug("freeing blocks %llu through %llu\n", o_blocks_count,
 130                    o_blocks_count + add);
 131         ext4_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);
 132         ext4_debug("freed blocks %llu through %llu\n", o_blocks_count,