From: David Sterba <dsterba@suse.com>
Date: Tue, 7 Jul 2020 16:30:06 +0000 (+0200)
Subject: btrfs: clear defrag status of a root if starting transaction fails
X-Git-Tag: Ubuntu-5.4.0-85.95~1014
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9ef902cd7ebb73e3b41be6124afdb96f47b630c7;p=mirror_ubuntu-focal-kernel.git

btrfs: clear defrag status of a root if starting transaction fails

BugLink: https://bugs.launchpad.net/bugs/1938199

commit 6819703f5a365c95488b07066a8744841bf14231 upstream.

The defrag loop processes leaves in batches and starting transaction for
each. The whole defragmentation on a given root is protected by a bit
but in case the transaction fails, the bit is not cleared

In case the transaction fails the bit would prevent starting
defragmentation again, so make sure it's cleared.

CC: stable@vger.kernel.org # 4.4+
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index aca6c467d776..d8e4e0bf3fc2 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1274,8 +1274,10 @@ int btrfs_defrag_root(struct btrfs_root *root)
 
 	while (1) {
 		trans = btrfs_start_transaction(root, 0);
-		if (IS_ERR(trans))
-			return PTR_ERR(trans);
+		if (IS_ERR(trans)) {
+			ret = PTR_ERR(trans);
+			break;
+		}
 
 		ret = btrfs_defrag_leaves(trans, root);