]> git.baikalelectronics.ru Git - kernel.git/commit
btrfs: delete stale comments after merge conflict resolution
authorDavid Sterba <dsterba@suse.com>
Tue, 11 Oct 2022 09:25:33 +0000 (11:25 +0200)
committerDavid Sterba <dsterba@suse.com>
Tue, 11 Oct 2022 12:47:54 +0000 (14:47 +0200)
commit4208d8595488b56be7ef58ec60f7085422ba6113
tree1377202f5b760d79caa86eab1b12ce9a29ec9586
parentace99719ac141f0ef47644fd8425b2b960aa0678
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 1bd35ed937c20 "btrfs: fix space cache
corruption and potential double allocations" and b2e68dbab3ab4 "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>
fs/btrfs/block-group.c