summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2009-04-03 00:46:06 +0400
committerChris Mason <chris.mason@oracle.com>2009-04-03 00:46:06 +0400
commitff0a5836ac48554b9f3b9d3c5f5bce4ddea11f1f (patch)
tree53138b3833e0d8d144cdc9c33a6ae32b6b737f84
parentd4a789474a6213d1b55b363fb1787b0abf877bba (diff)
downloadlinux-ff0a5836ac48554b9f3b9d3c5f5bce4ddea11f1f.tar.xz
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>
-rw-r--r--fs/btrfs/extent_map.c1
1 files changed, 0 insertions, 1 deletions
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);