From f93adb4a7a444d2714a6b237699dd3d7846f3281 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 25 Jun 2012 05:15:23 -0600
Subject: [PATCH] --- yaml --- r: 318841 b: refs/heads/master c:
 23291a044c31f9dfdeaf633b631059fb75e5c2c4 h: refs/heads/master i:   318839:
 7467d0090466d3666518c091c7d9b311a8542e82 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/btrfs/relocation.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ba15182b1ab0..f84fa1081b1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44c44af2f4a6dc1595f1711cf307bd01062fd129
+refs/heads/master: 23291a044c31f9dfdeaf633b631059fb75e5c2c4
diff --git a/trunk/fs/btrfs/relocation.c b/trunk/fs/btrfs/relocation.c
index 646ee21bb035..c5dbd9149679 100644
--- a/trunk/fs/btrfs/relocation.c
+++ b/trunk/fs/btrfs/relocation.c
@@ -1239,10 +1239,11 @@ static int __must_check __add_reloc_root(struct btrfs_root *root)
 			      node->bytenr, &node->rb_node);
 	spin_unlock(&rc->reloc_root_tree.lock);
 	if (rb_node) {
-		kfree(node);
 		btrfs_panic(root->fs_info, -EEXIST, "Duplicate root found "
 			    "for start=%llu while inserting into relocation "
 			    "tree\n");
+		kfree(node);
+		return -EEXIST;
 	}
 
 	list_add_tail(&root->root_list, &rc->reloc_roots);