]> git.hungrycats.org Git - linux/commitdiff
Revert "btrfs: relocation: Fix KASAN report on create_reloc_tree due to extended...
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Mon, 10 Feb 2020 02:37:06 +0000 (21:37 -0500)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Mon, 10 Feb 2020 02:37:06 +0000 (21:37 -0500)
This reverts commit 8be01e7bd232ae4297ba2880ca4be1690a28a329.

fs/btrfs/relocation.c

index 57a4e06ade83f1dad9bb5be32cba2f3fe64245a0..6d2cdccca7cb122e7de09b6eaeb8ebe069ce50fb 100644 (file)
@@ -4780,14 +4780,7 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,
        struct reloc_control *rc = root->fs_info->reloc_ctl;
        int ret;
 
-       /*
-        * We don't need to use reloc tree if:
-        * - No reloc tree
-        * - Relocation not running
-        * - Reloc tree already merged
-        */
-       if (!root->reloc_root || !rc || test_bit(BTRFS_ROOT_DEAD_RELOC_TREE,
-                               &root->state))
+       if (!root->reloc_root || !rc)
                return 0;
 
        rc = root->fs_info->reloc_ctl;