Skip to content

Commit 295a53c

Browse files
committed
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 ced8ecf "btrfs: fix space cache corruption and potential double allocations" and 527c490 "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 <[email protected]>
1 parent 9e769bd commit 295a53c

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

fs/btrfs/block-group.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,10 +774,8 @@ int btrfs_cache_block_group(struct btrfs_block_group *cache, bool wait)
774774

775775
btrfs_queue_work(fs_info->caching_workers, &caching_ctl->work);
776776
out:
777-
/* REVIEW */
778777
if (wait && caching_ctl)
779778
ret = btrfs_caching_ctl_wait_done(cache, caching_ctl);
780-
/* wait_event(caching_ctl->wait, space_cache_v1_done(cache)); */
781779
if (caching_ctl)
782780
btrfs_put_caching_control(caching_ctl);
783781

0 commit comments

Comments
 (0)