Skip to content
Commit 295a53cc authored by David Sterba's avatar David Sterba
Browse files

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 ced8ecf0 "btrfs: fix space cache
corruption and potential double allocations" and 527c490f "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: default avatarDavid Sterba <dsterba@suse.com>
parent 9e769bd7
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment