diff options
| author | David Sterba <dsterba@suse.com> | 2022-10-11 12:25:33 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-10-11 15:47:54 +0300 |
| commit | 295a53ccc4ca8383f6d107534b466b91aa013f79 (patch) | |
| tree | 1377202f5b760d79caa86eab1b12ce9a29ec9586 /fs/btrfs | |
| parent | 9e769bd7e5db5e3bd76e7c67004c261f7fcaa8f1 (diff) | |
| download | linux-295a53ccc4ca8383f6d107534b466b91aa013f79.tar.xz | |
btrfs: delete stale comments after merge conflict resolution
There are two comments in btrfs_cache_block_group that I left when
resolving conflict between commits ced8ecf026fd8 "btrfs: fix space cache
corruption and potential double allocations" and 527c490f44f6f "btrfs:
delete btrfs_wait_space_cache_v1_finished".
The former reworked the caching logic to wait until the caching ends in
btrfs_cache_block_group while the latter only open coded the waiting.
Both removed btrfs_wait_space_cache_v1_finished, the correct code is
with the waiting and returning error. Thus the conflict resolution was
OK.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/block-group.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index 32c415cfbdfe..deebc8ddbd93 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -774,10 +774,8 @@ 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); |