ext4: call ext4_mb_mark_context in ext4_free_blocks_simple

call ext4_mb_mark_context in ext4_free_blocks_simple to:
1. remove repeat code
2. pair update of free_clusters in ext4_mb_new_blocks_simple.
3. add missing ext4_lock_group/ext4_unlock_group protection.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20230928160407.142069-4-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 1629bd494167cb8a5db1942aa6e9b682cc207636..3761934c93989e9ea3392a2c5d262a391e9f7a4f 100644 (file)
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -6358,43 +6358,12 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,
 static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block,
                                        unsigned long count)
 {
-       struct buffer_head *bitmap_bh;
        struct super_block *sb = inode->i_sb;
-       struct ext4_group_desc *gdp;
-       struct buffer_head *gdp_bh;
        ext4_group_t group;
        ext4_grpblk_t blkoff;
-       int already_freed = 0, err, i;
 
        ext4_get_group_no_and_offset(sb, block, &group, &blkoff);
-       bitmap_bh = ext4_read_block_bitmap(sb, group);
-       if (IS_ERR(bitmap_bh)) {
-               pr_warn("Failed to read block bitmap\n");
-               return;
-       }
-       gdp = ext4_get_group_desc(sb, group, &gdp_bh);
-       if (!gdp)
-               goto err_out;
-
-       for (i = 0; i < count; i++) {
-               if (!mb_test_bit(blkoff + i, bitmap_bh->b_data))
-                       already_freed++;
-       }
-       mb_clear_bits(bitmap_bh->b_data, blkoff, count);
-       err = ext4_handle_dirty_metadata(NULL, NULL, bitmap_bh);
-       if (err)
-               goto err_out;
-       ext4_free_group_clusters_set(
-               sb, gdp, ext4_free_group_clusters(sb, gdp) +
-               count - already_freed);
-       ext4_block_bitmap_csum_set(sb, gdp, bitmap_bh);
-       ext4_group_desc_csum_set(sb, group, gdp);
-       ext4_handle_dirty_metadata(NULL, NULL, gdp_bh);
-       sync_dirty_buffer(bitmap_bh);
-       sync_dirty_buffer(gdp_bh);
-
-err_out:
-       brelse(bitmap_bh);
+       ext4_mb_mark_context(sb, false, group, blkoff, count);
 }
 
 /**