Commit 38b8f70c authored by Kemeng Shi's avatar Kemeng Shi Committed by Theodore Ts'o
Browse files

ext4: call ext4_mb_mark_context in ext4_mb_clear_bb 



Call ext4_mb_mark_context in ext4_mb_clear_bb to remove repeat code.

Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: default avatar"Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20230928160407.142069-8-shikemeng@huaweicloud.com


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

fs/ext4/mballoc.c

+10 −59
Original line number Diff line number Diff line
@@ -6367,19 +6367,17 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode, 
			       ext4_fsblk_t block, unsigned long count,

			       int flags)

{

	struct buffer_head *bitmap_bh = NULL;

	struct super_block *sb = inode->i_sb;

	struct ext4_group_desc *gdp;

	struct ext4_group_info *grp;

	unsigned int overflow;

	ext4_grpblk_t bit;

	struct buffer_head *gd_bh;

	ext4_group_t block_group;

	struct ext4_sb_info *sbi;

	struct ext4_buddy e4b;

	unsigned int count_clusters;

	int err = 0;

	int ret;

	int mark_flags = 0;

	ext4_grpblk_t changed;



	sbi = EXT4_SB(sb);
@@ -6428,64 +6426,19 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode, 
		goto error_clean;

	}



	bitmap_bh = ext4_read_block_bitmap(sb, block_group);

	if (IS_ERR(bitmap_bh)) {

		err = PTR_ERR(bitmap_bh);

		bitmap_bh = NULL;

		goto error_clean;

	}

	gdp = ext4_get_group_desc(sb, block_group, &gd_bh);

	if (!gdp) {

		err = -EIO;

		goto error_clean;

	}



	BUFFER_TRACE(bitmap_bh, "getting write access");

	err = ext4_journal_get_write_access(handle, sb, bitmap_bh,

					    EXT4_JTR_NONE);

	if (err)

		goto error_clean;



	/*

	 * We are about to modify some metadata.  Call the journal APIs

	 * to unshare ->b_data if a currently-committing transaction is

	 * using it

	 */

	BUFFER_TRACE(gd_bh, "get_write_access");

	err = ext4_journal_get_write_access(handle, sb, gd_bh, EXT4_JTR_NONE);

	if (err)

		goto error_clean;

#ifdef AGGRESSIVE_CHECK

	{

		int i;

		for (i = 0; i < count_clusters; i++)

			BUG_ON(!mb_test_bit(bit + i, bitmap_bh->b_data));

	}

	mark_flags |= EXT4_MB_BITMAP_MARKED_CHECK;

#endif

	ext4_lock_group(sb, block_group);

	mb_clear_bits(bitmap_bh->b_data, bit, count_clusters);

	ret = ext4_free_group_clusters(sb, gdp) + count_clusters;

	ext4_free_group_clusters_set(sb, gdp, ret);

	ext4_block_bitmap_csum_set(sb, gdp, bitmap_bh);

	ext4_group_desc_csum_set(sb, block_group, gdp);

	ext4_unlock_group(sb, block_group);

	err = ext4_mb_mark_context(handle, sb, false, block_group, bit,

				   count_clusters, mark_flags, &changed);



	if (sbi->s_log_groups_per_flex) {

		ext4_group_t flex_group = ext4_flex_group(sbi, block_group);

		atomic64_add(count_clusters,

			     &sbi_array_rcu_deref(sbi, s_flex_groups,

						  flex_group)->free_clusters);

	}



	/* We dirtied the bitmap block */

	BUFFER_TRACE(bitmap_bh, "dirtied bitmap block");

	err = ext4_handle_dirty_metadata(handle, NULL, bitmap_bh);

	if (err && changed == 0)

		goto error_clean;



	/* And the group descriptor block */

	BUFFER_TRACE(gd_bh, "dirtied group descriptor block");

	ret = ext4_handle_dirty_metadata(handle, NULL, gd_bh);

	if (!err)

		err = ret;

#ifdef AGGRESSIVE_CHECK

	BUG_ON(changed != count_clusters);

#endif



	/*

	 * We need to make sure we don't reuse the freed block until after the
@@ -6544,7 +6497,6 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode, 
		block += count;

		count = overflow;

		ext4_mb_unload_buddy(&e4b);

		put_bh(bitmap_bh);

		/* The range changed so it's no longer validated */

		flags &= ~EXT4_FREE_BLOCKS_VALIDATED;

		goto do_more;
@@ -6552,7 +6504,6 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode, 


error_clean:

	ext4_mb_unload_buddy(&e4b);

	brelse(bitmap_bh);

error_out:

	ext4_std_error(sb, err);

}