diff options
author | Dan Carpenter <error27@gmail.com> | 2009-04-02 16:46:06 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2009-04-02 16:46:06 -0400 |
commit | ff0a5836ac48554b9f3b9d3c5f5bce4ddea11f1f (patch) | |
tree | 53138b3833e0d8d144cdc9c33a6ae32b6b737f84 /fs/btrfs | |
parent | d4a789474a6213d1b55b363fb1787b0abf877bba (diff) |
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>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/extent_map.c | 1 |
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, | |||
234 | rb = tree_insert(&tree->map, em->start, &em->rb_node); | 234 | rb = tree_insert(&tree->map, em->start, &em->rb_node); |
235 | if (rb) { | 235 | if (rb) { |
236 | ret = -EEXIST; | 236 | ret = -EEXIST; |
237 | free_extent_map(merge); | ||
238 | goto out; | 237 | goto out; |
239 | } | 238 | } |
240 | atomic_inc(&em->refs); | 239 | atomic_inc(&em->refs); |