]> git.hungrycats.org Git - linux/commitdiff
Revert "zygo: btrfs: check for dead roots"
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Tue, 10 Dec 2019 17:29:18 +0000 (12:29 -0500)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Sat, 14 Dec 2019 04:53:11 +0000 (23:53 -0500)
This reverts commit 1d9c5ddd8e5e71c9aeeca8cc516ed713ce0281b9.

(cherry picked from commit 937df746f670f25c4f0b606279f21fe0c3351d0c)

fs/btrfs/relocation.c

index 1e2ccddde7c1313549f2329ebd35ec81d811bac6..84f7171fdebf3851b5d02e515c995b5f92827a25 100644 (file)
@@ -4797,11 +4797,6 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,
            !root->reloc_root || !rc)
                return 0;
 
-       if (test_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->reloc_root->state)) {
-               WARN_ON(1);
-               return 0;
-       }
-
        rc = root->fs_info->reloc_ctl;
        rc->merging_rsv_size += rc->nodes_relocated;