Browse Source

Btrfs: remove unnecessary code in btree_get_extent()

Unnecessary lookup_extent_mapping() is removed because an error is
returned to the caller.
This patch was made based on the advice from Stefan Behrens, thanks.

Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Tsutomu Itoh 12 years ago
parent
commit
b4f359ab06
1 changed files with 1 additions and 7 deletions
  1. 1 7
      fs/btrfs/disk-io.c

+ 1 - 7
fs/btrfs/disk-io.c

@@ -217,16 +217,10 @@ static struct extent_map *btree_get_extent(struct inode *inode,
 	write_lock(&em_tree->lock);
 	write_lock(&em_tree->lock);
 	ret = add_extent_mapping(em_tree, em);
 	ret = add_extent_mapping(em_tree, em);
 	if (ret == -EEXIST) {
 	if (ret == -EEXIST) {
-		u64 failed_start = em->start;
-		u64 failed_len = em->len;
-
 		free_extent_map(em);
 		free_extent_map(em);
 		em = lookup_extent_mapping(em_tree, start, len);
 		em = lookup_extent_mapping(em_tree, start, len);
-		if (!em) {
-			lookup_extent_mapping(em_tree, failed_start,
-					      failed_len);
+		if (!em)
 			em = ERR_PTR(-EIO);
 			em = ERR_PTR(-EIO);
-		}
 	} else if (ret) {
 	} else if (ret) {
 		free_extent_map(em);
 		free_extent_map(em);
 		em = ERR_PTR(ret);
 		em = ERR_PTR(ret);