From: Filipe Manana <fdmanana@suse.com>

Date: Wed, 9 Oct 2019 17:43:45 +0100

Git-commit: 44db1216efe37bf670f8d1019cdc41658d84baf5

Patch-mainline: 5.4

Subject: [PATCH] Btrfs: add missing extents release on file extent cluster

 relocation error

References: bsc#1159483

If we error out when finding a page at relocate_file_extent_cluster(), we

need to release the outstanding extents counter on the relocation inode,

set by the previous call to btrfs_delalloc_reserve_metadata(), otherwise

the inode's block reserve size can never decrease to zero and metadata

space is leaked. Therefore add a call to btrfs_delalloc_release_extents()

in case we can't find the target page.

Fixes: 8b62f87bad9c ("Btrfs: rework outstanding_extents")

CC: stable@vger.kernel.org # 4.19+

Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: David Sterba <dsterba@suse.com>

Signed-off-by: David Sterba <dsterba@suse.com>

---

 fs/btrfs/relocation.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c

index 94651898c559..3d51064e3619 100644

--- a/fs/btrfs/relocation.c

+++ b/fs/btrfs/relocation.c

@@ -3320,6 +3320,8 @@ static int relocate_file_extent_cluster(struct inode *inode,

 			if (!page) {

 				btrfs_delalloc_release_metadata(BTRFS_I(inode),

 							PAGE_SIZE, true);

+				btrfs_delalloc_release_extents(BTRFS_I(inode),

+							PAGE_SIZE, true);

 				ret = -ENOMEM;

 				goto out;

 			}

-- 

2.16.4