From c30cb0ebf4181d6de953dbf0c514c86613788927 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 14 Jul 2011 03:18:03 +0000
Subject: [PATCH] --- yaml --- r: 262246 b: refs/heads/master c:
 7e016a038e829c7d1271e1d57b8002860bbdf0db h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/fs/btrfs/extent_map.c | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 3d33ac201a56..088278b35552 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85d85a743da894029723e002eb556ceeebc03658
+refs/heads/master: 7e016a038e829c7d1271e1d57b8002860bbdf0db
diff --git a/trunk/fs/btrfs/extent_map.c b/trunk/fs/btrfs/extent_map.c
index 2d0410344ea3..911a9db801e0 100644
--- a/trunk/fs/btrfs/extent_map.c
+++ b/trunk/fs/btrfs/extent_map.c
@@ -379,23 +379,12 @@ struct extent_map *search_extent_mapping(struct extent_map_tree *tree,
 		em = rb_entry(next, struct extent_map, rb_node);
 		goto found;
 	}
-	if (!rb_node) {
-		em = NULL;
-		goto out;
-	}
-	if (IS_ERR(rb_node)) {
-		em = ERR_CAST(rb_node);
-		goto out;
-	}
-	em = rb_entry(rb_node, struct extent_map, rb_node);
-	goto found;
-
-	em = NULL;
-	goto out;
+	if (!rb_node)
+		return NULL;
 
+	em = rb_entry(rb_node, struct extent_map, rb_node);
 found:
 	atomic_inc(&em->refs);
-out:
 	return em;
 }