Commit 50fe716c authored Mar 26, 2024 by Boris Burkov Committed by Greg Kroah-Hartman May 17, 2024

btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve



[ Upstream commit 3c6f0c5ecc8910d4ffb0dfe85609ebc0c91c8f34 ]

Currently, this call site in btrfs_clear_delalloc_extent() only converts
the reservation. We are marking it not delalloc, so I don't think it
makes sense to keep the rsv around.  This is a path where we are not
sure to join a transaction, so it leads to incorrect free-ing during
umount.

Helps with the pass rate of generic/269 and generic/475.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Boris Burkov <boris@bur.io>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 0ef9d9c3

fs/btrfs/inode.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2051,7 +2051,7 @@ void btrfs_clear_delalloc_extent(struct inode *vfs_inode,
	*/		*/
	if (*bits & EXTENT_CLEAR_META_RESV &&		if (*bits & EXTENT_CLEAR_META_RESV &&
	root != fs_info->tree_root)		root != fs_info->tree_root)
	btrfs_delalloc_release_metadata(inode, len, false);		btrfs_delalloc_release_metadata(inode, len, true);

	/* For sanity tests. */		/* For sanity tests. */
	if (btrfs_is_testing(fs_info))		if (btrfs_is_testing(fs_info))