Commit e43bb4e6 authored by Namjae Jeon's avatar Namjae Jeon Committed by Theodore Ts'o
Browse files

ext4: decrement free clusters/inodes counters when block group declared bad 



We should decrement free clusters counter when block bitmap is marked
as corrupt and free inodes counter when the allocation bitmap is
marked as corrupt to avoid misunderstanding due to incorrect available
size in statfs result.  User can get immediately ENOSPC error from
write begin without reaching for the writepages.

Cc: Darrick J. Wong<darrick.wong@oracle.com>
Reported-by: default avatarAmit Sahrawat <amit.sahrawat83@gmail.com>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarAshish Sangwan <a.sangwan@samsung.com>
parent ec7756ae

fs/ext4/balloc.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -194,7 +194,16 @@ static void ext4_init_block_bitmap(struct super_block *sb, 
	if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {

	if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {

		ext4_error(sb, "Checksum bad for group %u", block_group);

		ext4_error(sb, "Checksum bad for group %u", block_group);

		grp = ext4_get_group_info(sb, block_group);

		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);

		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);

		set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);

		return;

		return;

	}

	}
@@ -359,6 +368,7 @@ static void ext4_validate_block_bitmap(struct super_block *sb, 
{

{

	ext4_fsblk_t	blk;

	ext4_fsblk_t	blk;

	struct ext4_group_info *grp = ext4_get_group_info(sb, block_group);

	struct ext4_group_info *grp = ext4_get_group_info(sb, block_group);

	struct ext4_sb_info *sbi = EXT4_SB(sb);





	if (buffer_verified(bh))

	if (buffer_verified(bh))

		return;

		return;
@@ -369,6 +379,9 @@ static void ext4_validate_block_bitmap(struct super_block *sb, 
		ext4_unlock_group(sb, block_group);

		ext4_unlock_group(sb, block_group);

		ext4_error(sb, "bg %u: block %llu: invalid block bitmap",

		ext4_error(sb, "bg %u: block %llu: invalid block bitmap",

			   block_group, blk);

			   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);

		set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);

		return;

		return;

	}

	}
@@ -376,6 +389,9 @@ static void ext4_validate_block_bitmap(struct super_block *sb, 
			desc, bh))) {

			desc, bh))) {

		ext4_unlock_group(sb, block_group);

		ext4_unlock_group(sb, block_group);

		ext4_error(sb, "bg %u: bad block bitmap checksum", 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);

		set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);

		return;

		return;

	}

	}

fs/ext4/ialloc.c

+23 −0
Original line number Original line Diff line number Diff line
@@ -71,6 +71,7 @@ static unsigned ext4_init_inode_bitmap(struct super_block *sb, 
				       struct ext4_group_desc *gdp)

				       struct ext4_group_desc *gdp)

{

{

	struct ext4_group_info *grp;

	struct ext4_group_info *grp;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	J_ASSERT_BH(bh, buffer_locked(bh));

	J_ASSERT_BH(bh, buffer_locked(bh));





	/* If checksum is bad mark all blocks and inodes use to prevent

	/* If checksum is bad mark all blocks and inodes use to prevent
@@ -78,7 +79,16 @@ static unsigned ext4_init_inode_bitmap(struct super_block *sb, 
	if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {

	if (!ext4_group_desc_csum_verify(sb, block_group, gdp)) {

		ext4_error(sb, "Checksum bad for group %u", block_group);

		ext4_error(sb, "Checksum bad for group %u", block_group);

		grp = ext4_get_group_info(sb, block_group);

		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);

		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);

		set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);

		return 0;

		return 0;

	}

	}
@@ -116,6 +126,7 @@ ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group) 
	struct buffer_head *bh = NULL;

	struct buffer_head *bh = NULL;

	ext4_fsblk_t bitmap_blk;

	ext4_fsblk_t bitmap_blk;

	struct ext4_group_info *grp;

	struct ext4_group_info *grp;

	struct ext4_sb_info *sbi = EXT4_SB(sb);





	desc = ext4_get_group_desc(sb, block_group, NULL);

	desc = ext4_get_group_desc(sb, block_group, NULL);

	if (!desc)

	if (!desc)
@@ -185,6 +196,12 @@ verify: 
		ext4_error(sb, "Corrupt inode bitmap - block_group = %u, "

		ext4_error(sb, "Corrupt inode bitmap - block_group = %u, "

			   "inode_bitmap = %llu", block_group, bitmap_blk);

			   "inode_bitmap = %llu", block_group, bitmap_blk);

		grp = ext4_get_group_info(sb, block_group);

		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);

		set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);

		return NULL;

		return NULL;

	}

	}
@@ -321,6 +338,12 @@ out: 
			fatal = err;

			fatal = err;

	} else {

	} else {

		ext4_error(sb, "bit already cleared for inode %lu", ino);

		ext4_error(sb, "bit already cleared for inode %lu", ino);

		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);

		set_bit(EXT4_GROUP_INFO_IBITMAP_CORRUPT_BIT, &grp->bb_state);

	}

	}

fs/ext4/mballoc.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -722,6 +722,7 @@ void ext4_mb_generate_buddy(struct super_block *sb, 
				void *buddy, void *bitmap, ext4_group_t group)

				void *buddy, void *bitmap, ext4_group_t group)

{

{

	struct ext4_group_info *grp = ext4_get_group_info(sb, group);

	struct ext4_group_info *grp = ext4_get_group_info(sb, group);

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb);

	ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb);

	ext4_grpblk_t i = 0;

	ext4_grpblk_t i = 0;

	ext4_grpblk_t first;

	ext4_grpblk_t first;
@@ -759,6 +760,9 @@ void ext4_mb_generate_buddy(struct super_block *sb, 
		 * corrupt and update bb_free using bitmap value

		 * corrupt and update bb_free using bitmap value

		 */

		 */

		grp->bb_free = free;

		grp->bb_free = free;

		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);

		set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT, &grp->bb_state);

	}

	}

	mb_set_largest_free_order(sb, grp);

	mb_set_largest_free_order(sb, grp);
@@ -1431,6 +1435,7 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b, 
		right_is_free = !mb_test_bit(last + 1, e4b->bd_bitmap);

		right_is_free = !mb_test_bit(last + 1, e4b->bd_bitmap);





	if (unlikely(block != -1)) {

	if (unlikely(block != -1)) {

		struct ext4_sb_info *sbi = EXT4_SB(sb);

		ext4_fsblk_t blocknr;

		ext4_fsblk_t blocknr;





		blocknr = ext4_group_first_block_no(sb, e4b->bd_group);

		blocknr = ext4_group_first_block_no(sb, e4b->bd_group);
@@ -1441,6 +1446,9 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b, 
				      "freeing already freed block "

				      "freeing already freed block "

				      "(bit %u); block bitmap corrupt.",

				      "(bit %u); block bitmap corrupt.",

				      block);

				      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. */

		/* Mark the block group as corrupt. */

		set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT,

		set_bit(EXT4_GROUP_INFO_BBITMAP_CORRUPT_BIT,

			&e4b->bd_info->bb_state);

			&e4b->bd_info->bb_state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE