From b7bb3e161b853b43b0bdf4453e66888eb9446bd8 Mon Sep 17 00:00:00 2001
From: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Date: Thu, 13 Sep 2012 03:32:54 -0600
Subject: [PATCH] --- yaml --- r: 332567 b: refs/heads/master c:
 b4f359ab065b9c6c132124557d23e90e2e8504be h: refs/heads/master i:   332565:
 df69d53681f05d4b8fcda0061c792500e689e180   332563:
 b141493b502b1b0ee7d8afcb35cffb7a9b51c4df   332559:
 cd630e9a8c55423f911bab62954d49f84e0f9b19 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/disk-io.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a891e2d1f266..6aeb3c24632a 100644
--- 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
index 8db87bc53d27..8d633e3e3919 100644
--- 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);