Export btrfs_remove_block_group_priority() to header ctree.h. Call btrfs_remove_block_group_priority() while deleting transaction->deleted_bgs, btrfs_free_block_groups() and btrfs_remove_block_group().
Signed-off-by: Su Yue <suy.f...@cn.fujitsu.com> --- fs/btrfs/ctree.h | 1 + fs/btrfs/extent-tree.c | 3 +++ fs/btrfs/transaction.c | 1 + 3 files changed, 5 insertions(+) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 4c56baf9f7cf..091b878e326c 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -2752,6 +2752,7 @@ u64 btrfs_data_alloc_profile(struct btrfs_fs_info *fs_info); u64 btrfs_metadata_alloc_profile(struct btrfs_fs_info *fs_info); u64 btrfs_system_alloc_profile(struct btrfs_fs_info *fs_info); void btrfs_clear_space_info_full(struct btrfs_fs_info *info); +void btrfs_remove_block_group_priority(struct btrfs_block_group_cache *cache); enum btrfs_reserve_flush_enum { /* If we are in the transaction, we can't flush anything.*/ diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index fc40901b4772..74955f79fcce 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -9896,6 +9896,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info) list_del(&block_group->list); up_write(&block_group->space_info->groups_sem); + btrfs_remove_block_group_priority(block_group); /* * We haven't cached this block group, which means we could * possibly have excluded extents on this block group. @@ -10571,6 +10572,8 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, clear_avail_alloc_bits(fs_info, block_group->flags); } up_write(&block_group->space_info->groups_sem); + btrfs_remove_block_group_priority(block_group); + if (kobj) { kobject_del(kobj); kobject_put(kobj); diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index f92c0a88c4ad..74234de9304a 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -72,6 +72,7 @@ void btrfs_put_transaction(struct btrfs_transaction *transaction) struct btrfs_block_group_cache, bg_list); list_del_init(&cache->bg_list); + btrfs_remove_block_group_priority(cache); btrfs_put_block_group_trimming(cache); btrfs_put_block_group(cache); } -- 2.19.1