---

yaml --- r: 140340 b: refs/heads/master c: ff0a583 h: refs/heads/master v: v3
git-mirror · Apr 2, 2009 · 6de8e66 · 6de8e66
1 parent 468caa6
commit 6de8e66
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4a789474a6213d1b55b363fb1787b0abf877bba
+refs/heads/master: ff0a5836ac48554b9f3b9d3c5f5bce4ddea11f1f
diff --git a/trunk/fs/btrfs/extent_map.c b/trunk/fs/btrfs/extent_map.c
@@ -234,7 +234,6 @@ int add_extent_mapping(struct extent_map_tree *tree,
 	rb = tree_insert(&tree->map, em->start, &em->rb_node);
 	if (rb) {
 		ret = -EEXIST;
-		free_extent_map(merge);
 		goto out;
 	}
 	atomic_inc(&em->refs);