From: Dan Carpenter <error27@gmail.com>
Date: Thu, 2 Apr 2009 20:46:06 +0000 (-0400)
Subject: Btrfs: remove dead code
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff0a5836ac48554b9f3b9d3c5f5bce4ddea11f1f;p=linux-beck.git

Btrfs: remove dead code

merge is always NULL at this point.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index 50da69da20ce..b187917b36fa 100644
--- a/fs/btrfs/extent_map.c
+++ b/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);