--- /dev/null
+Subject: [PATCH] ext4: add new ext4_mark_group_bitmap_corrupted() helper
+
+Since there are many places to set inode/block bitmap
+corrupt bit, add a new helper for it, which will make
+codes more clear.
+
+Signed-off-by: Wang Shilong <wshilong@ddn.com>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Reviewed-by: Andreas Dilger <adilger@dilger.ca>
+---
+ fs/ext4/balloc.c | 29 +++++++----------------------
+ fs/ext4/ext4.h | 7 +++++++
+ fs/ext4/ialloc.c | 20 ++++----------------
+ fs/ext4/mballoc.c | 9 ++-------
+ fs/ext4/super.c | 30 ++++++++++++++++++++++++++++++
+ 5 files changed, 50 insertions(+), 45 deletions(-)
+
+diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
+index 2455fe1..5ced5e5 100644
+--- a/fs/ext4/balloc.c
++++ b/fs/ext4/balloc.c
+@@ -183,25 +183,15 @@ static int ext4_init_block_bitmap(struct super_block *sb,
+ unsigned int bit, bit_max;
+ struct ext4_sb_info *sbi = EXT4_SB(sb);
+ ext4_fsblk_t start, tmp;
+- struct ext4_group_info *grp;
+
+ J_ASSERT_BH(bh, buffer_locked(bh));
+
+ /* If checksum is bad mark all blocks used to prevent allocation
+ * essentially implementing a per-group read-only flag. */
+ if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {
+- grp = ext4_get_group_info(sb, block_group);
+- if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
+- percpu_counter_sub(&sbi->s_freeclusters_counter,
+- grp->bb_free);
+- set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
+- if (!EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
+- int count;
+- count = ext4_free_inodes_count(sb, gdp);
+- percpu_counter_sub(&sbi->s_freeinodes_counter,
+- count);
+- }
+- set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
++ ext4_mark_group_bitmap_corrupted(sb, block_group,
++ EXT4_GROUP_INFO_BBITMAP_CORRUPT |
++ EXT4_GROUP_INFO_IBITMAP_CORRUPT);
+ return -EFSBADCRC;
+ }
+ memset(bh->b_data, 0, sb->s_blocksize);
+@@ -370,7 +360,6 @@ static int ext4_validate_block_bitmap(struct super_block *sb,
+ {
+ ext4_fsblk_t blk;
+ struct ext4_group_info *grp = ext4_get_group_info(sb, block_group);
+- struct ext4_sb_info *sbi = EXT4_SB(sb);
+
+ if (buffer_verified(bh))
+ return 0;
+@@ -384,10 +373,8 @@ static int ext4_validate_block_bitmap(struct super_block *sb,
+ desc, bh))) {
+ ext4_unlock_group(sb, block_group);
+ ext4_error(sb, "bg %u: bad block bitmap checksum", block_group);
+- if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
+- percpu_counter_sub(&sbi->s_freeclusters_counter,
+- grp->bb_free);
+- set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
++ ext4_mark_group_bitmap_corrupted(sb, block_group,
++ EXT4_GROUP_INFO_BBITMAP_CORRUPT);
+ return -EFSBADCRC;
+ }
+ blk = ext4_valid_block_bitmap(sb, desc, block_group, bh);
+@@ -395,10 +382,8 @@ static int ext4_validate_block_bitmap(struct super_block *sb,
+ ext4_unlock_group(sb, block_group);
+ ext4_error(sb, "bg %u: block %llu: invalid block bitmap",
+ block_group, blk);
+- if (!EXT4_MB_GRP_BBITMAP_CORRUPT(grp))
+- percpu_counter_sub(&sbi->s_freeclusters_counter,
+- grp->bb_free);
+- set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);
++ ext4_mark_group_bitmap_corrupted(sb, block_group,
++ EXT4_GROUP_INFO_BBITMAP_CORRUPT);
+ return -EFSCORRUPTED;
+ }
+ set_buffer_verified(bh);
+diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
+index 357d71f..3362231 100644
+--- a/fs/ext4/ext4.h
++++ b/fs/ext4/ext4.h
+@@ -2759,6 +2759,9 @@ extern int ext4_alloc_flex_bg_array(struct super_block *sb,
+ ext4_group_t ngroup);
+ extern const char *ext4_decode_error(struct super_block *sb, int errno,
+ char nbuf[16]);
++extern void ext4_mark_group_bitmap_corrupted(struct super_block *sb,
++ ext4_group_t block_group,
++ unsigned int flags);
+
+ extern __printf(4, 5)
+ void __ext4_error(struct super_block *, const char *, unsigned int,
+@@ -3087,6 +3090,10 @@ struct ext4_group_info {
+ #define EXT4_GROUP_INFO_WAS_TRIMMED_BIT 1
+ #define EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT 2
+ #define EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT 3
++#define EXT4_GROUP_INFO_BBITMAP_CORRUPT \
++ (1 << EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT)
++#define EXT4_GROUP_INFO_IBITMAP_CORRUPT \
++ (1 << EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT)
+
+ #define EXT4_MB_GRP_NEED_INIT(grp) \
+ (test_bit(EXT4_GROUP_INFO_NEED_INIT_BIT, &((grp)->bb_state)))
+diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
+index 0f284fb..d4cd50b 100644
+--- a/fs/ext4/ialloc.c
++++ b/fs/ext4/ialloc.c
+@@ -82,7 +82,6 @@ static int ext4_validate_inode_bitmap(struct super_block *sb,
+ {
+ ext4_fsblk_t blk;
+ struct ext4_group_info *grp = ext4_get_group_info(sb, block_group);
+- struct ext4_sb_info *sbi = EXT4_SB(sb);
+
+ if (buffer_verified(bh))
+ return 0;
+@@ -98,14 +97,8 @@ static int ext4_validate_inode_bitmap(struct super_block *sb,
+ ext4_unlock_group(sb, block_group);
+ ext4_error(sb, "Corrupt inode bitmap - block_group = %u, "
+ "inode_bitmap = %llu", block_group, blk);
+- grp = ext4_get_group_info(sb, block_group);
+- if (!EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
+- int count;
+- count = ext4_free_inodes_count(sb, desc);
+- percpu_counter_sub(&sbi->s_freeinodes_counter,
+- count);
+- }
+- set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
++ ext4_mark_group_bitmap_corrupted(sb, block_group,
++ EXT4_GROUP_INFO_IBITMAP_CORRUPT);
+ return -EFSBADCRC;
+ }
+ set_buffer_verified(bh);
+@@ -349,13 +342,8 @@ out:
+ fatal = err;
+ } else {
+ ext4_error(sb, "bit already cleared for inode %lu", ino);
+- if (gdp && !EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
+- int count;
+- count = ext4_free_inodes_count(sb, gdp);
+- percpu_counter_sub(&sbi->s_freeinodes_counter,
+- count);
+- }
+- set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);
++ ext4_mark_group_bitmap_corrupted(sb, block_group,
++ EXT4_GROUP_INFO_IBITMAP_CORRUPT);
+ }
+
+ error_return:
+diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
+index 0dd98ad..2e094aa 100644
+--- a/fs/ext4/mballoc.c
++++ b/fs/ext4/mballoc.c
+@@ -1454,7 +1454,6 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,
+ right_is_free = !mb_test_bit(last + 1, e4b->bd_bitmap);
+
+ if (unlikely(block != -1)) {
+- struct ext4_sb_info *sbi = EXT4_SB(sb);
+ ext4_fsblk_t blocknr;
+
+ blocknr = ext4_group_first_block_no(sb, e4b->bd_group);
+@@ -1465,12 +1464,8 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,
+ "freeing already freed block "
+ "(bit %u); block bitmap corrupt.",
+ block);
+- if (!EXT4_MB_GRP_BBITMAP_CORRUPT(e4b->bd_info))
+- percpu_counter_sub(&sbi->s_freeclusters_counter,
+- e4b->bd_info->bb_free);
+- /* Mark the block group as corrupt. */
+- set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT,
+- &e4b->bd_info->bb_state);
++ ext4_mark_group_bitmap_corrupted(sb, e4b->bd_group,
++ EXT4_GROUP_INFO_BBITMAP_CORRUPT);
+ mb_regenerate_buddy(e4b);
+ goto done;
+ }
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index ffbe9f0..432c4a1 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -770,6 +770,36 @@ __acquires(bitlock)
+ return;
+ }
+
++void ext4_mark_group_bitmap_corrupted(struct super_block *sb,
++ ext4_group_t group,
++ unsigned int flags)
++{
++ struct ext4_sb_info *sbi = EXT4_SB(sb);
++ struct ext4_group_info *grp = ext4_get_group_info(sb, group);
++ struct ext4_group_desc *gdp = ext4_get_group_desc(sb, group, NULL);
++
++ if ((flags & EXT4_GROUP_INFO_BBITMAP_CORRUPT) &&
++ !EXT4_MB_GRP_BBITMAP_CORRUPT(grp)) {
++ percpu_counter_sub(&sbi->s_freeclusters_counter,
++ grp->bb_free);
++ set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT,
++ &grp->bb_state);
++ }
++
++ if ((flags & EXT4_GROUP_INFO_IBITMAP_CORRUPT) &&
++ !EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
++ if (gdp) {
++ int count;
++
++ count = ext4_free_inodes_count(sb, gdp);
++ percpu_counter_sub(&sbi->s_freeinodes_counter,
++ count);
++ }
++ set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT,
++ &grp->bb_state);
++ }
++}
++
+ void ext4_update_dynamic_rev(struct super_block *sb)
+ {
+ struct ext4_super_block *es = EXT4_SB(sb)->s_es;
+--
+2.20.1
+
git://git.whamcloud.com / fs / lustre-release.git / blobdiff