]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Btrfs: remove dead code
authorDan Carpenter <error27@gmail.com>
Thu, 2 Apr 2009 20:46:06 +0000 (16:46 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 2 Apr 2009 20:46:06 +0000 (16:46 -0400)
merge is always NULL at this point.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/extent_map.c

index 50da69da20cec141fca63ffba2a4e92b8f93f875..b187917b36fa8c19202b1e5049f3bbf9aaef451f 100644 (file)
@@ -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);