]> git.hungrycats.org Git - linux/commitdiff
Revert "btrfs: relocation: Fix a KASAN use-after-free bug due to extended reloc tree...
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Mon, 10 Feb 2020 02:36:57 +0000 (21:36 -0500)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Mon, 10 Feb 2020 02:36:57 +0000 (21:36 -0500)
This reverts commit 4a9b6801f502fef4f5ad5a4076e6951890b10650.

fs/btrfs/relocation.c

index 76ceac6b9661fa6089f86ac9b57daffc8ec1b2d9..fb57dfc52e93a1099fa4be351fc3328d9efb30a9 100644 (file)
@@ -524,10 +524,6 @@ static int should_ignore_root(struct btrfs_root *root)
        if (!test_bit(BTRFS_ROOT_REF_COWS, &root->state))
                return 0;
 
-       /* This root has been merged with its reloc tree, so we can ignore it */
-       if (test_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state))
-               return 1;
-
        reloc_root = root->reloc_root;
        if (!reloc_root)
                return 0;