---

yaml --- r: 318841 b: refs/heads/master c: 23291a0 h: refs/heads/master i: 318839: 7467d00 v: v3
git-mirror · Jul 23, 2012 · f93adb4 · f93adb4
1 parent 2abddd4
commit f93adb4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);