diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2008-07-12 01:27:31 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-07-12 01:27:31 +0200 |
| commit | 6afd670713c9e7d5c5550e379dfedca8ffab4c90 (patch) | |
| tree | 3cf037d9d0f91bef6cebd77523da71d68bb1a7f8 | |
| parent | ext4: Fix sparse warning (diff) | |
| download | linux-6afd670713c9e7d5c5550e379dfedca8ffab4c90.tar.xz linux-6afd670713c9e7d5c5550e379dfedca8ffab4c90.zip | |
ext4: fix ext4_init_block_bitmap() for metablock block group
When meta_bg feature is enabled and s_first_meta_bg != 0,
ext4_init_block_bitmap() miscalculates the number of block used by
the group descriptor table (0 or 1 for metablock block group)
This patch fixes this by using ext4_bg_num_gdb()
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Tweedie <sct@redhat.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Acked-by: Andreas Dilger <adilger@sun.com>
| -rw-r--r-- | fs/ext4/balloc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index 6dcbec9b2562..1327ac3a04de 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -121,12 +121,7 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks); } } else { /* For META_BG_BLOCK_GROUPS */ - int group_rel = (block_group - - le32_to_cpu(sbi->s_es->s_first_meta_bg)) % - EXT4_DESC_PER_BLOCK(sb); - if (group_rel == 0 || group_rel == 1 || - (group_rel == EXT4_DESC_PER_BLOCK(sb) - 1)) - bit_max += 1; + bit_max += ext4_bg_num_gdb(sb, block_group); } if (block_group == sbi->s_groups_count - 1) { |