From 13cfc2504f045e8ac26a49e4edf317a668b70df8 Mon Sep 17 00:00:00 2001
From: Yan <yanzheng@21cn.com>
Date: Fri, 16 Nov 2007 14:57:09 -0500
Subject: [PATCH] --- yaml --- r: 128541 b: refs/heads/master c:
 5e5745dcaf73c5860a16c09572d59383ecee6d28 h: refs/heads/master i:   128539:
 bce0751ed11fcc66e417141cf88cfde4ba24eeb9 v: v3

---
 [refs]                       |  2 +-
 trunk/fs/btrfs/extent-tree.c | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index eeb580467af5..1ac4cc835057 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 324ae4df00fdc1a6a179bf584d8addf027bb75fb
+refs/heads/master: 5e5745dcaf73c5860a16c09572d59383ecee6d28
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index 4ef6dc3d7d32..e5340677d6c4 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -158,10 +158,10 @@ struct btrfs_block_group_cache *btrfs_lookup_block_group(struct
 
 	return NULL;
 }
-
 static u64 find_search_start(struct btrfs_root *root,
 			     struct btrfs_block_group_cache **cache_ret,
-			     u64 search_start, int num, int data)
+			     u64 search_start, int num,
+			     int data, int full_scan)
 {
 	int ret;
 	struct btrfs_block_group_cache *cache = *cache_ret;
@@ -218,10 +218,10 @@ static u64 find_search_start(struct btrfs_root *root,
 	if (cache_miss && !cache->cached) {
 		cache_block_group(root, cache);
 		last = cache_miss;
-
 		cache = btrfs_lookup_block_group(root->fs_info, last);
 	}
-	cache = btrfs_find_block_group(root, cache, last, data, 0);
+	if (!full_scan)
+		cache = btrfs_find_block_group(root, cache, last, data, 0);
 	*cache_ret = cache;
 	cache_miss = 0;
 	goto again;
@@ -979,12 +979,10 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
 
 	total_needed += empty_size;
 	path = btrfs_alloc_path();
-
 check_failed:
-	search_start = find_search_start(root, &block_group,
-					 search_start, total_needed, data);
+	search_start = find_search_start(root, &block_group, search_start,
+					 total_needed, data, full_scan);
 	cached_start = search_start;
-
 	btrfs_init_path(path);
 	ins->objectid = search_start;
 	ins->offset = 0;