Skip to content

Commit 12b2d64

Browse files
Christoph Hellwigkdave
authored andcommitted
btrfs: properly clear end of the unreserved range in cow_file_range
When the call to btrfs_reloc_clone_csums in cow_file_range returns an error, we jump to the out_unlock label with the extent_reserved variable set to false. The cleanup at the label will then call extent_clear_unlock_delalloc on the range from start to end. But we've already added cur_alloc_size to start before the jump, so there might no range be left from the newly incremented start to end. Move the check for 'start < end' so that it is reached by also for the !extent_reserved case. CC: stable@vger.kernel.org # 6.1+ Fixes: a315e68 ("Btrfs: fix invalid attempt to free reserved space on failure to cow range") Reviewed-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 5c25699 commit 12b2d64

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fs/btrfs/inode.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,8 +1654,6 @@ static noinline int cow_file_range(struct btrfs_inode *inode,
16541654
clear_bits,
16551655
page_ops);
16561656
start += cur_alloc_size;
1657-
if (start >= end)
1658-
return ret;
16591657
}
16601658

16611659
/*
@@ -1664,9 +1662,11 @@ static noinline int cow_file_range(struct btrfs_inode *inode,
16641662
* space_info's bytes_may_use counter, reserved in
16651663
* btrfs_check_data_free_space().
16661664
*/
1667-
extent_clear_unlock_delalloc(inode, start, end, locked_page,
1668-
clear_bits | EXTENT_CLEAR_DATA_RESV,
1669-
page_ops);
1665+
if (start < end) {
1666+
clear_bits |= EXTENT_CLEAR_DATA_RESV;
1667+
extent_clear_unlock_delalloc(inode, start, end, locked_page,
1668+
clear_bits, page_ops);
1669+
}
16701670
return ret;
16711671
}
16721672

0 commit comments

Comments
 (0)