Commit 497885f7 authored by Kemeng Shi's avatar Kemeng Shi Committed by Theodore Ts'o
Browse files

ext4: fix unit mismatch in ext4_mb_new_blocks_simple 



The "i" returned from mb_find_next_zero_bit is in cluster unit and we
need offset "block" corresponding to "i" in block unit. Convert "i" to
block unit to fix the unit mismatch.

Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: default avatarOjaswin Mujoo <ojaswin@linux.ibm.com>
Link: https://lore.kernel.org/r/20230603150327.3596033-3-shikemeng@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent b3916da0

fs/ext4/mballoc.c

+4 −2
Original line number Diff line number Diff line
@@ -6011,6 +6011,7 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, 
{

	struct buffer_head *bitmap_bh;

	struct super_block *sb = ar->inode->i_sb;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	ext4_group_t group;

	ext4_grpblk_t blkoff;

	ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb);
@@ -6039,7 +6040,8 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, 
			if (i >= max)

				break;

			if (ext4_fc_replay_check_excluded(sb,

				ext4_group_first_block_no(sb, group) + i)) {

				ext4_group_first_block_no(sb, group) +

				EXT4_C2B(sbi, i))) {

				blkoff = i + 1;

			} else

				break;
@@ -6056,7 +6058,7 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, 
		return 0;

	}



	block = ext4_group_first_block_no(sb, group) + i;

	block = ext4_group_first_block_no(sb, group) + EXT4_C2B(sbi, i);

	ext4_mb_mark_bb(sb, block, 1, 1);

	ar->len = 1;