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

Btrfs: Fix allocation routines to avoid intermixing data and metadata allocations

Browse Source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason
2007-10-15 16:17:44 -04:00
parent 6b80053d02
commit e19caa5f0e
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,7 @@ static u64 find_search_start(struct btrfs_root *root,
{ {
int ret; int ret;
struct btrfs_block_group_cache *cache = *cache_ret; struct btrfs_block_group_cache *cache = *cache_ret;
u64 last = max(search_start, cache->key.objectid); u64 last;
u64 start = 0; u64 start = 0;
u64 end = 0; u64 end = 0;
@@ -173,11 +173,14 @@ again:
ret = cache_block_group(root, cache); ret = cache_block_group(root, cache);
if (ret) if (ret)
goto out; goto out;
last = max(search_start, cache->key.objectid);
while(1) { while(1) {
ret = find_first_extent_bit(&root->fs_info->free_space_cache, ret = find_first_extent_bit(&root->fs_info->free_space_cache,
last, &start, &end, EXTENT_DIRTY); last, &start, &end, EXTENT_DIRTY);
if (ret) if (ret) {
goto out; goto new_group;
}
start = max(last, start); start = max(last, start);
last = end + 1; last = end + 1;
@@ -191,15 +194,13 @@ out:
return search_start; return search_start;
new_group: new_group:
cache = btrfs_lookup_block_group(root->fs_info, last = cache->key.objectid + cache->key.offset;
last + cache->key.offset - 1); cache = btrfs_lookup_block_group(root->fs_info, last);
if (!cache) { if (!cache) {
return search_start; return search_start;
} }
cache = btrfs_find_block_group(root, cache, cache = btrfs_find_block_group(root, cache, last, data, 0);
last + cache->key.offset - 1, data, 0);
*cache_ret = cache; *cache_ret = cache;
last = min(cache->key.objectid, last);
goto again; goto again;
} }
@@ -257,12 +258,7 @@ struct btrfs_block_group_cache *btrfs_find_block_group(struct btrfs_root *root,
if (used < div_factor(hint->key.offset, factor)) { if (used < div_factor(hint->key.offset, factor)) {
return hint; return hint;
} }
last = hint->key.offset * 3; last = hint->key.objectid + hint->key.offset;
if (hint->key.objectid >= last)
last = max(search_start + hint->key.offset - 1,
hint->key.objectid - last);
else
last = hint->key.objectid + hint->key.offset;
hint_last = last; hint_last = last;
} else { } else {
if (hint) if (hint)
@@ -913,7 +909,6 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
check_failed: check_failed:
search_start = find_search_start(root, &block_group, search_start = find_search_start(root, &block_group,
search_start, total_needed, data); search_start, total_needed, data);
btrfs_init_path(path); btrfs_init_path(path);
ins->objectid = search_start; ins->objectid = search_start;
ins->offset = 0; ins->offset = 0;
@@ -958,6 +953,9 @@ check_failed:
continue; continue;
if (ret < 0) if (ret < 0)
goto error; goto error;
search_start = max(search_start,
block_group->key.objectid);
if (!start_found) { if (!start_found) {
ins->objectid = search_start; ins->objectid = search_start;
ins->offset = search_end - search_start; ins->offset = search_end - search_start;
@@ -967,6 +965,7 @@ check_failed:
ins->objectid = last_byte > search_start ? ins->objectid = last_byte > search_start ?
last_byte : search_start; last_byte : search_start;
ins->offset = search_end - ins->objectid; ins->offset = search_end - ins->objectid;
BUG_ON(ins->objectid >= search_end);
goto check_pending; goto check_pending;
} }
btrfs_item_key_to_cpu(l, &key, slot); btrfs_item_key_to_cpu(l, &key, slot);
@@ -998,7 +997,7 @@ check_failed:
block_group->key.offset) { block_group->key.offset) {
btrfs_release_path(root, path); btrfs_release_path(root, path);
search_start = block_group->key.objectid + search_start = block_group->key.objectid +
block_group->key.offset * 2; block_group->key.offset;
goto new_group; goto new_group;
} }
next: next:
@@ -1015,6 +1014,12 @@ check_pending:
if (ins->objectid + num_bytes >= search_end) if (ins->objectid + num_bytes >= search_end)
goto enospc; goto enospc;
if (!full_scan && ins->objectid + num_bytes >= block_group->
key.objectid + block_group->key.offset) {
search_start = block_group->key.objectid +
block_group->key.offset;
goto new_group;
}
if (test_range_bit(&info->extent_ins, ins->objectid, if (test_range_bit(&info->extent_ins, ins->objectid,
ins->objectid + num_bytes -1, EXTENT_LOCKED, 0)) { ins->objectid + num_bytes -1, EXTENT_LOCKED, 0)) {
search_start = ins->objectid + num_bytes; search_start = ins->objectid + num_bytes;
@@ -1114,6 +1119,7 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans,
set_extent_bits(&root->fs_info->extent_ins, ins->objectid, set_extent_bits(&root->fs_info->extent_ins, ins->objectid,
ins->objectid + ins->offset - 1, ins->objectid + ins->offset - 1,
EXTENT_LOCKED, GFP_NOFS); EXTENT_LOCKED, GFP_NOFS);
WARN_ON(data == 1);
goto update_block; goto update_block;
} }

6
fs/btrfs/extent_map.c
View File

@@ -981,7 +981,7 @@ int find_first_extent_bit(struct extent_map_tree *tree, u64 start,
struct extent_state *state; struct extent_state *state;
int ret = 1; int ret = 1;
write_lock_irq(&tree->lock); read_lock_irq(&tree->lock);
/* /*
* this search will find all the extents that end after * this search will find all the extents that end after
* our range starts. * our range starts.
@@ -993,7 +993,7 @@ int find_first_extent_bit(struct extent_map_tree *tree, u64 start,
while(1) { while(1) {
state = rb_entry(node, struct extent_state, rb_node); state = rb_entry(node, struct extent_state, rb_node);
if (state->state & bits) { if (state->end >= start && (state->state & bits)) {
*start_ret = state->start; *start_ret = state->start;
*end_ret = state->end; *end_ret = state->end;
ret = 0; ret = 0;
@@ -1004,7 +1004,7 @@ int find_first_extent_bit(struct extent_map_tree *tree, u64 start,
break; break;
} }
out: out:
write_unlock_irq(&tree->lock); read_unlock_irq(&tree->lock);
return ret; return ret;
} }
EXPORT_SYMBOL(find_first_extent_bit); EXPORT_SYMBOL(find_first_extent_bit);