From b3e050452fd43a9c2ecde79bb06e40108be9ee05 Mon Sep 17 00:00:00 2001
From: Miao Xie <miaox@cn.fujitsu.com>
Date: Tue, 15 Dec 2009 06:54:17 +0000
Subject: [PATCH] --- yaml --- r: 180051 b: refs/heads/master c:
 b8d9bfeb18f9af794020d96e9bee984d18a8d737 h: refs/heads/master i:   180049:
 fd9ba9806b77d265bf8bcf953641463371655a71   180047:
 ea2331c756e1852cbc55c23f0715988df1a60fae v: v3

---
 [refs]                      |  2 +-
 trunk/fs/btrfs/extent_map.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index fa3e9b1719e5..c9b76c729e46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a555f810af6d63ea5960abaed88e150ad95c3011
+refs/heads/master: b8d9bfeb18f9af794020d96e9bee984d18a8d737
diff --git a/trunk/fs/btrfs/extent_map.c b/trunk/fs/btrfs/extent_map.c
index ccbdcb54ec5d..5a4f73b79b75 100644
--- a/trunk/fs/btrfs/extent_map.c
+++ b/trunk/fs/btrfs/extent_map.c
@@ -155,20 +155,6 @@ static struct rb_node *__tree_search(struct rb_root *root, u64 offset,
 	return NULL;
 }
 
-/*
- * look for an offset in the tree, and if it can't be found, return
- * the first offset we can find smaller than 'offset'.
- */
-static inline struct rb_node *tree_search(struct rb_root *root, u64 offset)
-{
-	struct rb_node *prev;
-	struct rb_node *ret;
-	ret = __tree_search(root, offset, &prev, NULL);
-	if (!ret)
-		return prev;
-	return ret;
-}
-
 /* check to see if two extent_map structs are adjacent and safe to merge */
 static int mergable_maps(struct extent_map *prev, struct extent_map *next)
 {