Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 736dedbb authored by Wang Shilong's avatar Wang Shilong Committed by Theodore Ts'o
Browse files

ext4: mark block bitmap corrupted when found 



There are still some cases that we missed to set
block bitmaps corrupted bit properly:

1) block bitmap number is wrong.
2) failed to read block bitmap due to disk errors.
3) double free block bitmaps..
4) some mismatch check with bitmaps vs buddy information.

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarLiu Bo <bo.liu@linux.alibaba.com>
Signed-off-by: default avatarWang Shilong <wshilong@ddn.com>
Reviewed-by: default avatarLiu Bo <bo.liu@linux.alibaba.com>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
parent 206f6d55

fs/ext4/balloc.c

+4 −0
Original line number Diff line number Diff line
@@ -421,6 +421,8 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group) 
	    (bitmap_blk >= ext4_blocks_count(sbi->s_es))) {

		ext4_error(sb, "Invalid block bitmap block %llu in "

			   "block_group %u", bitmap_blk, block_group);

		ext4_mark_group_bitmap_corrupted(sb, block_group,

					EXT4_GROUP_INFO_BBITMAP_CORRUPT);

		return ERR_PTR(-EFSCORRUPTED);

	}

	bh = sb_getblk(sb, bitmap_blk);
@@ -499,6 +501,8 @@ int ext4_wait_block_bitmap(struct super_block *sb, ext4_group_t block_group, 
		ext4_error(sb, "Cannot read block bitmap - "

			   "block_group = %u, block_bitmap = %llu",

			   block_group, (unsigned long long) bh->b_blocknr);

		ext4_mark_group_bitmap_corrupted(sb, block_group,

					EXT4_GROUP_INFO_BBITMAP_CORRUPT);

		return -EIO;

	}

	clear_buffer_new(bh);

fs/ext4/mballoc.c

+6 −0
Original line number Diff line number Diff line
@@ -470,6 +470,8 @@ static void mb_free_blocks_double(struct inode *inode, struct ext4_buddy *e4b, 
					      "freeing block already freed "

					      "(bit %u)",

					      first + i);

			ext4_mark_group_bitmap_corrupted(sb, e4b->bd_group,

					EXT4_GROUP_INFO_BBITMAP_CORRUPT);

		}

		mb_clear_bit(first + i, e4b->bd_info->bb_bitmap);

	}
@@ -1950,6 +1952,8 @@ void ext4_mb_complex_scan_group(struct ext4_allocation_context *ac, 
					"%d free clusters as per "

					"group info. But bitmap says 0",

					free);

			ext4_mark_group_bitmap_corrupted(sb, e4b->bd_group,

					EXT4_GROUP_INFO_BBITMAP_CORRUPT);

			break;

		}
@@ -1960,6 +1964,8 @@ void ext4_mb_complex_scan_group(struct ext4_allocation_context *ac, 
					"%d free clusters as per "

					"group info. But got %d blocks",

					free, ex.fe_len);

			ext4_mark_group_bitmap_corrupted(sb, e4b->bd_group,

					EXT4_GROUP_INFO_BBITMAP_CORRUPT);

			/*

			 * The number of free blocks differs. This mostly

			 * indicate that the bitmap is corrupt. So exit