---

yaml --- r: 332567 b: refs/heads/master c: b4f359a h: refs/heads/master i: 332565: df69d53 332563: b141493 332559: cd630e9 v: v3
git-mirror · Oct 4, 2012 · b7bb3e1 · b7bb3e1
1 parent ae86e11
commit b7bb3e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0433f20d436fd040013e5a419a2e3d732d618a41
+refs/heads/master: b4f359ab065b9c6c132124557d23e90e2e8504be
diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c
@@ -217,16 +217,10 @@ static struct extent_map *btree_get_extent(struct inode *inode,
 	write_lock(&em_tree->lock);
 	ret = add_extent_mapping(em_tree, em);
 	if (ret == -EEXIST) {
-		u64 failed_start = em->start;
-		u64 failed_len = em->len;
-
 		free_extent_map(em);
 		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);
-		}
 	} else if (ret) {
 		free_extent_map(em);
 		em = ERR_PTR(ret);