From: David Sterba <dsterba@suse.com>
Date: Tue, 23 Jan 2024 22:19:19 +0000 (+0100)
Subject: btrfs: handle root deletion lookup error in btrfs_del_root()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0fe29838ba0aee39a7bca46bb47e7ca348a9e161;p=linux.git

btrfs: handle root deletion lookup error in btrfs_del_root()

We're deleting a root and looking it up by key does not succeed, this
is an inconsistent state and we can't do anything. All callers handle
errors and abort a transaction.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 3f6d10eb1aafc..ce831660550bf 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -322,8 +322,11 @@ int btrfs_del_root(struct btrfs_trans_handle *trans,
 	ret = btrfs_search_slot(trans, root, key, path, -1, 1);
 	if (ret < 0)
 		goto out;
-
-	BUG_ON(ret != 0);
+	if (ret != 0) {
+		/* The root must exist but we did not find it by the key. */
+		ret = -EUCLEAN;
+		goto out;
+	}
 
 	ret = btrfs_del_item(trans, root, path);
 out: