+++ /dev/null
-diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
-index 61aeacb..026c89f 100644
---- a/fs/ext4/balloc.c
-+++ b/fs/ext4/balloc.c
-@@ -97,12 +97,11 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *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(sbi, block_group, gdp)) {
-- ext4_error(sb, "Checksum bad for group %u",
-+ ext4_corrupted_block_group(sb, block_group,
-+ EXT4_GROUP_INFO_BBITMAP_CORRUPT |
-+ EXT4_GROUP_INFO_IBITMAP_CORRUPT,
-+ "Checksum bad for group %u",
- block_group);
-- ext4_free_blks_set(sb, gdp, 0);
-- ext4_free_inodes_set(sb, gdp, 0);
-- ext4_itable_unused_set(sb, gdp, 0);
-- memset(bh->b_data, 0xff, sb->s_blocksize);
- return 0;
- }
- memset(bh->b_data, 0, sb->s_blocksize);
-@@ -277,7 +276,9 @@ static int ext4_valid_block_bitmap(struct super_block *sb,
- return 1;
-
- err_out:
-- ext4_error(sb, "Invalid block bitmap - block_group = %d, block = %llu",
-+ ext4_corrupted_block_group(sb, block_group,
-+ EXT4_GROUP_INFO_BBITMAP_CORRUPT,
-+ "Invalid block bitmap - block_group = %d, block = %llu",
- block_group, bitmap_blk);
- return 0;
- }
-diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index 4ed330c..938487a 100644
---- a/fs/ext4/ext4.h
-+++ b/fs/ext4/ext4.h
-@@ -75,8 +75,17 @@ typedef __u32 ext4_lblk_t;
- /* data type for block group number */
- typedef unsigned int ext4_group_t;
-
-+void __ext4_corrupted_block_group(struct super_block *sb,
-+ ext4_group_t group, unsigned int flags);
-+
-+#define ext4_corrupted_block_group(sb, group, flags, fmt...) \
-+ do { \
-+ __ext4_warning(sb, __func__, ## fmt); \
-+ __ext4_corrupted_block_group(sb, group, flags); \
-+ } while (0)
-+
- /*
-- * Flags used in mballoc's allocation_context flags field.
-+ * Flags used in mballoc's allocation_context flags field.
- *
- * Also used to show what's going on for debugging purposes when the
- * flag field is exported via the traceport interface
-@@ -2203,9 +2212,19 @@ struct ext4_group_info {
-
- #define EXT4_GROUP_INFO_NEED_INIT_BIT 0
- #define EXT4_GROUP_INFO_WAS_TRIMMED_BIT 1
-+#define EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT 2
-+#define EXT4_GROUP_INFO_BBITMAP_CORRUPT \
-+ (1 << EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT)
-+#define EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT 3
-+#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)))
-+#define EXT4_MB_GRP_BBITMAP_CORRUPT(grp) \
-+ (test_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &((grp)->bb_state)))
-+#define EXT4_MB_GRP_IBITMAP_CORRUPT(grp) \
-+ (test_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &((grp)->bb_state)))
-
- #define EXT4_MB_GRP_WAS_TRIMMED(grp) \
- (test_bit(EXT4_GROUP_INFO_WAS_TRIMMED_BIT, &((grp)->bb_state)))
-diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
-index f3509ba..8894963 100644
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -76,11 +76,10 @@ unsigned ext4_init_inode_bitmap(struct super_block *sb, struct buffer_head *bh,
- /* If checksum is bad mark all blocks and inodes use to prevent
- * allocation, essentially implementing a per-group read-only flag. */
- if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) {
-- ext4_error(sb, "Checksum bad for group %u", block_group);
-- ext4_free_blks_set(sb, gdp, 0);
-- ext4_free_inodes_set(sb, gdp, 0);
-- ext4_itable_unused_set(sb, gdp, 0);
-- memset(bh->b_data, 0xff, sb->s_blocksize);
-+ ext4_corrupted_block_group(sb, block_group,
-+ EXT4_GROUP_INFO_BBITMAP_CORRUPT |
-+ EXT4_GROUP_INFO_IBITMAP_CORRUPT,
-+ "Checksum bad for group %u", block_group);
- return 0;
- }
-
-@@ -192,6 +191,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
- struct ext4_super_block *es;
- struct ext4_sb_info *sbi;
- int fatal = 0, err, count, cleared;
-+ struct ext4_group_info *grp;
-
- if (atomic_read(&inode->i_count) > 1) {
- printk(KERN_ERR "ext4_free_inode: inode has count=%d\n",
-@@ -235,7 +235,9 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
- block_group = (ino - 1) / EXT4_INODES_PER_GROUP(sb);
- bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);
- bitmap_bh = ext4_read_inode_bitmap(sb, block_group);
-- if (!bitmap_bh)
-+ /* Don't bother if the inode bitmap is corrupt. */
-+ grp = ext4_get_group_info(sb, block_group);
-+ if (unlikely(EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) || !bitmap_bh)
- goto error_return;
-
- BUFFER_TRACE(bitmap_bh, "get_write_access");
-@@ -247,9 +249,12 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
- ext4_lock_group(sb, block_group);
- cleared = ext4_clear_bit(bit, bitmap_bh->b_data);
- ext4_unlock_group(sb, block_group);
-- if (!cleared)
-- ext4_error(sb, "bit already cleared for inode %lu", ino);
-- else {
-+ if (!cleared) {
-+ ext4_corrupted_block_group(sb, block_group,
-+ EXT4_GROUP_INFO_IBITMAP_CORRUPT,
-+ "bit already cleared for inode %lu",
-+ ino);
-+ } else {
- gdp = ext4_get_group_desc(sb, block_group, &bh2);
-
- BUFFER_TRACE(bh2, "get_write_access");
-@@ -825,6 +830,7 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode,
- int free = 0;
- static int once = 1;
- ext4_group_t flex_group;
-+ struct ext4_group_info *grp;
-
- /* Cannot create files in a deleted directory */
- if (!dir || !dir->i_nlink)
-@@ -884,10 +890,21 @@ got_group:
- if (!gdp)
- goto fail;
-
-+ grp = ext4_get_group_info(sb, group);
-+ /* Skip groups with already-known suspicious inode tables */
-+ if (EXT4_MB_GRP_IBITMAP_CORRUPT(grp)) {
-+ if (++group == ngroups)
-+ group = 0;
-+ continue;
-+ }
- brelse(inode_bitmap_bh);
- inode_bitmap_bh = ext4_read_inode_bitmap(sb, group);
-- if (!inode_bitmap_bh)
-- goto fail;
-+ /* Skip groups with suspicious inode tables */
-+ if (EXT4_MB_GRP_IBITMAP_CORRUPT(grp) || !inode_bitmap_bh) {
-+ if (++group == ngroups)
-+ group = 0;
-+ continue;
-+ }
-
- repeat_in_this_group:
- ino = ext4_find_next_zero_bit((unsigned long *)
-diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
-index efcf909..06cd929 100644
---- a/fs/ext4/mballoc.c
-+++ b/fs/ext4/mballoc.c
-@@ -715,10 +715,12 @@ int ext4_mb_generate_buddy(struct super_block *sb,
- if (free != grp->bb_free) {
- struct ext4_group_desc *gdp;
- gdp = ext4_get_group_desc (sb, group, NULL);
-- ext4_error(sb, "group %lu: %u blocks in bitmap, %u in bb, "
-- "%u in gd, %lu pa's\n", (long unsigned int)group,
-- free, grp->bb_free, ext4_free_blks_count(sb, gdp),
-- grp->bb_prealloc_nr);
-+ ext4_corrupted_block_group(sb, group,
-+ EXT4_GROUP_INFO_BBITMAP_CORRUPT,
-+ "group %lu: %u blocks in bitmap, %u in bb, %u in gd, %lu pa's\n",
-+ (long unsigned int)group, free, grp->bb_free,
-+ ext4_free_blks_count(sb, gdp),
-+ grp->bb_prealloc_nr);
- return -EIO;
- }
- mb_set_largest_free_order(sb, grp);
-@@ -1120,7 +1122,7 @@ ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group,
- */
- ret = ext4_mb_init_group(sb, group);
- if (ret)
-- return ret;
-+ goto err;
- }
-
- /*
-@@ -1204,6 +1206,8 @@ ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group,
- return 0;
-
- err:
-+ ext4_warning(sb, "Error in loading buddy information for %u",
-+ group);
- if (e4b->bd_bitmap_page)
- page_cache_release(e4b->bd_bitmap_page);
- if (e4b->bd_buddy_page)
-@@ -1291,6 +1295,10 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,
-
- BUG_ON(first + count > (sb->s_blocksize << 3));
- assert_spin_locked(ext4_group_lock_ptr(sb, e4b->bd_group));
-+ /* Don't bother if the block group is corrupt. */
-+ if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b->bd_info)))
-+ return;
-+
- mb_check_buddy(e4b);
- mb_free_blocks_double(inode, e4b, first, count);
-
-@@ -1321,9 +1329,12 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,
- le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block);
- ext4_grp_locked_error(sb, e4b->bd_group,
- __func__, "double-free of inode"
-- " %lu's block %llu(bit %u in group %u)",
-+ " %lu's block %llu(bit %u in group %u) block bitmap corrupt",
- inode ? inode->i_ino : 0, blocknr, block,
- e4b->bd_group);
-+ /* Mark the block group as corrupt. */
-+ set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT,
-+ &e4b->bd_info->bb_state);
- }
- mb_clear_bit(block, EXT4_MB_BITMAP(e4b));
- e4b->bd_info->bb_counters[order]++;
-@@ -1700,6 +1711,11 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac,
- if (err)
- return err;
-
-+ if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b->bd_info))) {
-+ ext4_mb_release_desc(e4b);
-+ return 0;
-+ }
-+
- ext4_lock_group(ac->ac_sb, group);
- max = mb_find_extent(e4b, 0, ac->ac_g_ex.fe_start,
- ac->ac_g_ex.fe_len, &ex);
-@@ -1912,6 +1928,9 @@ static int ext4_mb_good_group(struct ext4_allocation_context *ac,
-
- BUG_ON(cr < 0 || cr >= 4);
-
-+ if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(grp)))
-+ return 0;
-+
- /* We only do this if the grp has never been initialized */
- if (unlikely(EXT4_MB_GRP_NEED_INIT(grp))) {
- int ret = ext4_mb_init_group(ac->ac_sb, group);
-@@ -3382,9 +3401,10 @@ int ext4_mb_check_ondisk_bitmap(struct super_block *sb, void *bitmap,
- }
-
- if (free != free_in_gdp) {
-- ext4_error(sb, "on-disk bitmap for group %d"
-- "corrupted: %u blocks free in bitmap, %u - in gd\n",
-- group, free, free_in_gdp);
-+ ext4_corrupted_block_group(sb, group,
-+ EXT4_GROUP_INFO_BBITMAP_CORRUPT,
-+ "on-disk bitmap for group %d corrupted: %u blocks free in bitmap, %u - in gd\n",
-+ group, free, free_in_gdp);
- return -EIO;
- }
- return 0;
-@@ -3753,14 +3773,6 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
- /* "free < pa->pa_free" means we maybe double alloc the same blocks,
- * otherwise maybe leave some free blocks unavailable, no need to BUG.*/
- if ((free > pa->pa_free && !pa->pa_error) || (free < pa->pa_free)) {
-- ext4_error(sb, "pa free mismatch: [pa %p] "
-- "[phy %lu] [logic %lu] [len %u] [free %u] "
-- "[error %u] [inode %lu] [freed %u]", pa,
-- (unsigned long)pa->pa_pstart,
-- (unsigned long)pa->pa_lstart,
-- (unsigned)pa->pa_len, (unsigned)pa->pa_free,
-- (unsigned)pa->pa_error, pa->pa_inode->i_ino,
-- free);
- ext4_grp_locked_error(sb, group,
- __func__, "free %u, pa_free %u",
- free, pa->pa_free);
-@@ -3834,14 +3846,11 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
- return 0;
-
- bitmap_bh = ext4_read_block_bitmap(sb, group);
-- if (bitmap_bh == NULL) {
-- ext4_error(sb, "Error reading block bitmap for %u", group);
-+ if (bitmap_bh == NULL)
- return 0;
-- }
-
- err = ext4_mb_load_buddy(sb, group, &e4b);
- if (err) {
-- ext4_error(sb, "Error loading buddy information for %u", group);
- put_bh(bitmap_bh);
- return 0;
- }
-@@ -4015,16 +4024,11 @@ repeat:
- ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, NULL);
-
- err = ext4_mb_load_buddy(sb, group, &e4b);
-- if (err) {
-- ext4_error(sb, "Error loading buddy information for %u",
-- group);
-+ if (err)
- return;
-- }
-
- bitmap_bh = ext4_read_block_bitmap(sb, group);
- if (bitmap_bh == NULL) {
-- ext4_error(sb, "Error reading block bitmap for %u",
-- group);
- ext4_mb_release_desc(&e4b);
- continue;
- }
-@@ -4299,11 +4303,8 @@ ext4_mb_discard_lg_preallocations(struct super_block *sb,
- list_for_each_entry_safe(pa, tmp, &discard_list, u.pa_tmp_list) {
-
- ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, NULL);
-- if (ext4_mb_load_buddy(sb, group, &e4b)) {
-- ext4_error(sb, "Error loading buddy information for %u",
-- group);
-+ if (ext4_mb_load_buddy(sb, group, &e4b))
- continue;
-- }
- ext4_lock_group(sb, group);
- list_del(&pa->pa_group_list);
- ext4_get_group_info(sb, group)->bb_prealloc_nr--;
-@@ -4565,7 +4566,7 @@ repeat:
- * been updated or not when fail case. So can
- * not revert pa_free back, just mark pa_error*/
- pa->pa_error++;
-- ext4_error(sb,
-+ ext4_corrupted_block_group(sb, 0, 0,
- "Updating bitmap error: [err %d] "
- "[pa %p] [phy %lu] [logic %lu] "
- "[len %u] [free %u] [error %u] "
-@@ -4710,6 +4711,7 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,
- struct ext4_sb_info *sbi;
- struct ext4_buddy e4b;
- int err = 0;
-+ int skip_error = 0;
- int ret;
-
- /*
-@@ -4746,6 +4748,10 @@ do_more:
- overflow = 0;
- ext4_get_group_no_and_offset(sb, block, &block_group, &bit);
-
-+ if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(
-+ ext4_get_group_info(sb, block_group))))
-+ return;
-+
- /*
- * Check to see if we are freeing blocks across a group
- * boundary.
-@@ -4807,8 +4813,10 @@ do_more:
- }
-
- err = ext4_mb_load_buddy(sb, block_group, &e4b);
-- if (err)
-+ if (err) {
-+ skip_error = 1;
- goto error_return;
-+ }
- if ((flags & EXT4_FREE_BLOCKS_METADATA) && ext4_handle_valid(handle)) {
- struct ext4_free_data *new_entry;
- /*
-@@ -4876,10 +4884,10 @@ error_return:
- if (freed && !(flags & EXT4_FREE_BLOCKS_NO_QUOT_UPDATE))
- vfs_dq_free_block(inode, freed);
- brelse(bitmap_bh);
-- ext4_std_error(sb, err);
-+ if (!skip_error)
-+ ext4_std_error(sb, err);
- if (ac)
- kmem_cache_free(ext4_ac_cachep, ac);
-- return;
- }
-
- /**
-@@ -4970,7 +4978,7 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb,
-
- err = ext4_mb_load_buddy(sb, block_group, &e4b);
- if (err)
-- goto error_return;
-+ goto error_brelse;
-
- /*
- * need to update group_info->bb_free and bitmap
-@@ -5006,9 +5014,9 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb,
- sb->s_dirt = 1;
-
- error_return:
-- brelse(bitmap_bh);
- ext4_std_error(sb, err);
-- return;
-+error_brelse:
-+ brelse(bitmap_bh);
- }
-
- /**
-@@ -5078,11 +5086,8 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group,
- trace_ext4_trim_all_free(sb, group, start, max);
-
- ret = ext4_mb_load_buddy(sb, group, &e4b);
-- if (ret) {
-- ext4_error(sb, "Error in loading buddy "
-- "information for %u", group);
-+ if (ret)
- return ret;
-- }
- bitmap = e4b.bd_bitmap;
-
- ext4_lock_group(sb, group);
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 31ee33b..f02a632 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -562,6 +562,34 @@ void __ext4_warning(struct super_block *sb, const char *function,
- va_end(args);
- }
-
-+void __ext4_corrupted_block_group(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)) {
-+ ext4_free_blks_set(sb, gdp, 0);
-+ 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) {
-+ ext4_free_inodes_set(sb, gdp, 0);
-+ ext4_itable_unused_set(sb, gdp, 0);
-+ }
-+ set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT,
-+ &grp->bb_state);
-+ }
-+ sbi->s_mount_state |= EXT4_ERROR_FS;
-+ sbi->s_es->s_state |= cpu_to_le16(EXT4_ERROR_FS);
-+ ext4_commit_super(sb, 1);
-+}
-+
- void ext4_grp_locked_error(struct super_block *sb, ext4_group_t grp,
- const char *function, const char *fmt, ...)
- __releases(bitlock)