From: Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Date: Mon, 10 Feb 2020 02:36:57 +0000 (-0500)
Subject: Revert "btrfs: relocation: Fix a KASAN use-after-free bug due to extended reloc tree... 
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2eff7ac730129e4487810eb3e52bd45929b373a;p=linux

Revert "btrfs: relocation: Fix a KASAN use-after-free bug due to extended reloc tree lifespan"

This reverts commit 4a9b6801f502fef4f5ad5a4076e6951890b10650.
---

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 76ceac6b9661..fb57dfc52e93 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -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;