]> git.baikalelectronics.ru Git - kernel.git/commitdiff
btrfs: replace the BUG_ON in btrfs_del_root_ref with proper error handling
authorQu Wenruo <wqu@suse.com>
Wed, 1 Dec 2021 11:56:17 +0000 (19:56 +0800)
committerDavid Sterba <dsterba@suse.com>
Wed, 8 Dec 2021 14:45:27 +0000 (15:45 +0100)
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: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/root-tree.c

index 702dc5441f039743b4ad1cb99d10624084898705..db37a37996497828fa6124df02547fc6e03a9a34 100644 (file)
@@ -336,7 +336,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],