From: Josef Bacik Date: Fri, 15 Jul 2022 19:45:29 +0000 (-0400) Subject: btrfs: delete btrfs_wait_space_cache_v1_finished X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=527c490f44f6f13df30980203822a913c39c8192;p=kernel.git btrfs: delete btrfs_wait_space_cache_v1_finished We used to use this in a few spots, but now we only use it directly inside of block-group.c, so remove the helper and just open code where we were using it. Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index 413addb4a6183..9d549a117d725 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -783,8 +783,10 @@ int btrfs_cache_block_group(struct btrfs_block_group *cache, bool wait) btrfs_queue_work(fs_info->caching_workers, &caching_ctl->work); out: + /* REVIEW */ if (wait && caching_ctl) ret = btrfs_caching_ctl_wait_done(cache, caching_ctl); + /* wait_event(caching_ctl->wait, space_cache_v1_done(cache)); */ if (caching_ctl) btrfs_put_caching_control(caching_ctl); diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h index 66221da02e416..6d5ce78c69567 100644 --- a/fs/btrfs/block-group.h +++ b/fs/btrfs/block-group.h @@ -309,8 +309,6 @@ void btrfs_reserve_chunk_metadata(struct btrfs_trans_handle *trans, u64 btrfs_get_alloc_profile(struct btrfs_fs_info *fs_info, u64 orig_flags); void btrfs_put_block_group_cache(struct btrfs_fs_info *info); int btrfs_free_block_groups(struct btrfs_fs_info *info); -void btrfs_wait_space_cache_v1_finished(struct btrfs_block_group *cache, - struct btrfs_caching_control *caching_ctl); int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start, struct block_device *bdev, u64 physical, u64 **logical, int *naddrs, int *stripe_len);