Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 412498e9 authored by Qu Wenruo's avatar Qu Wenruo Committed by Greg Kroah-Hartman
Browse files

btrfs: replace the BUG_ON in btrfs_del_root_ref with proper error handling 



commit 8289ed9f93bef2762f9184e136d994734b16d997 upstream.

I hit the BUG_ON() with generic/475 test case, and to my surprise, all
callers of btrfs_del_root_ref() are already aborting transaction, thus
there is not need for such BUG_ON(), just go to @out label and caller
will properly handle the error.

CC: stable@vger.kernel.org # 5.4+
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aa4740bc

fs/btrfs/root-tree.c

+2 −1
Original line number Diff line number Diff line
@@ -371,7 +371,8 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 
	key.offset = ref_id;

again:

	ret = btrfs_search_slot(trans, tree_root, &key, path, -1, 1);

	BUG_ON(ret < 0);

	if (ret < 0)

		goto out;

	if (ret == 0) {

		leaf = path->nodes[0];

		ref = btrfs_item_ptr(leaf, path->slots[0],