ext4: sync up block and inode bitmap reading functions

ext4_read_block_bitmap and read_inode_bitmap do essentially
the same thing, and yet they are structured quite differently.
I came across this difference while looking at doing bg locking
during bg initialization.

This patch:

* removes unnecessary casts in the error messages
* renames read_inode_bitmap to ext4_read_inode_bitmap
* and more substantially, restructures the inode bitmap
  reading function to be more like the block bitmap counterpart.

The change to the inode bitmap reader simplifies the locking
to be applied in the next patch.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 495ab21b9832..386cb79ac4b6 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -314,8 +314,8 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group)
         if (unlikely(!bh)) {
                 ext4_error(sb, __func__,
                             "Cannot read block bitmap - "
-                            "block_group = %d, block_bitmap = %llu",
-                            (int)block_group, (unsigned long long)bitmap_blk);
+                            "block_group = %lu, block_bitmap = %llu",
+                            block_group, bitmap_blk);
                 return NULL;
         }
         if (bh_uptodate_or_lock(bh))
@@ -331,8 +331,8 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group)
                 put_bh(bh);
                 ext4_error(sb, __func__,
                             "Cannot read block bitmap - "
-                            "block_group = %d, block_bitmap = %llu",
-                            (int)block_group, (unsigned long long)bitmap_blk);
+                            "block_group = %lu, block_bitmap = %llu",
+                            block_group, bitmap_blk);
                 return NULL;
         }
         ext4_valid_block_bitmap(sb, desc, block_group, bh);