lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: Add full_scan parameter to find_search_start

Browse Source 
This patch adds a new parameter 'full_scan' to 'find_search_start',
thereby 'find_search_start' can know whether 'find_free_extent' is in
full scan phrase. I feel that 'find_search_start' should skip calling
'btrfs_find_block_group' when 'find_free_extent' is in full scan
phrase. In my test on a 2GB volume, Oops occurs when space usage is
about 76%. After apply the patch,  Oops occurs when space usage is
near 100%.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Yan
2007-11-16 14:57:09 -05:00
committed by Chris Mason
parent 324ae4df00
commit 5e5745dcaf
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/btrfs/extent-tree.c
View File

@@ -158,10 +158,10 @@ struct btrfs_block_group_cache *btrfs_lookup_block_group(struct
return NULL; return NULL;
} }
static u64 find_search_start(struct btrfs_root *root, static u64 find_search_start(struct btrfs_root *root,
struct btrfs_block_group_cache **cache_ret, 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; int ret;
struct btrfs_block_group_cache *cache = *cache_ret; struct btrfs_block_group_cache *cache = *cache_ret;
@@ -218,10 +218,10 @@ wrapped:
if (cache_miss && !cache->cached) { if (cache_miss && !cache->cached) {
cache_block_group(root, cache); cache_block_group(root, cache);
last = cache_miss; last = cache_miss;
cache = btrfs_lookup_block_group(root->fs_info, last); 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_ret = cache;
cache_miss = 0; cache_miss = 0;
goto again; goto again;
@@ -979,12 +979,10 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
total_needed += empty_size; total_needed += empty_size;
path = btrfs_alloc_path(); path = btrfs_alloc_path();
check_failed: check_failed:
search_start = find_search_start(root, &block_group, search_start = find_search_start(root, &block_group, search_start,
search_start, total_needed, data); total_needed, data, full_scan);
cached_start = search_start; cached_start = search_start;
btrfs_init_path(path); btrfs_init_path(path);
ins->objectid = search_start; ins->objectid = search_start;
ins->offset = 0; ins->offset = 0;