Skip to content

Commit 26d0f87

Browse files
Kemeng Shitytso
authored andcommitted
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 <[email protected]> Reviewed-by: "Ritesh Harjani (IBM)" <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent f9e2d95 commit 26d0f87

File tree

1 file changed

+1
-32
lines changed

1 file changed

+1
-32
lines changed

fs/ext4/mballoc.c

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6358,43 +6358,12 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,
63586358
static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block,
63596359
unsigned long count)
63606360
{
6361-
struct buffer_head *bitmap_bh;
63626361
struct super_block *sb = inode->i_sb;
6363-
struct ext4_group_desc *gdp;
6364-
struct buffer_head *gdp_bh;
63656362
ext4_group_t group;
63666363
ext4_grpblk_t blkoff;
6367-
int already_freed = 0, err, i;
63686364

63696365
ext4_get_group_no_and_offset(sb, block, &group, &blkoff);
6370-
bitmap_bh = ext4_read_block_bitmap(sb, group);
6371-
if (IS_ERR(bitmap_bh)) {
6372-
pr_warn("Failed to read block bitmap\n");
6373-
return;
6374-
}
6375-
gdp = ext4_get_group_desc(sb, group, &gdp_bh);
6376-
if (!gdp)
6377-
goto err_out;
6378-
6379-
for (i = 0; i < count; i++) {
6380-
if (!mb_test_bit(blkoff + i, bitmap_bh->b_data))
6381-
already_freed++;
6382-
}
6383-
mb_clear_bits(bitmap_bh->b_data, blkoff, count);
6384-
err = ext4_handle_dirty_metadata(NULL, NULL, bitmap_bh);
6385-
if (err)
6386-
goto err_out;
6387-
ext4_free_group_clusters_set(
6388-
sb, gdp, ext4_free_group_clusters(sb, gdp) +
6389-
count - already_freed);
6390-
ext4_block_bitmap_csum_set(sb, gdp, bitmap_bh);
6391-
ext4_group_desc_csum_set(sb, group, gdp);
6392-
ext4_handle_dirty_metadata(NULL, NULL, gdp_bh);
6393-
sync_dirty_buffer(bitmap_bh);
6394-
sync_dirty_buffer(gdp_bh);
6395-
6396-
err_out:
6397-
brelse(bitmap_bh);
6366+
ext4_mb_mark_context(sb, false, group, blkoff, count);
63986367
}
63996368

64006369
/**

0 commit comments

Comments
 (0)