Signed-off-by: Chris Mason <chris.mason@oracle.com>
{
int ret;
struct btrfs_block_group_cache *cache = *cache_ret;
{
int ret;
struct btrfs_block_group_cache *cache = *cache_ret;
- u64 last = max(search_start, cache->key.objectid);
u64 start = 0;
u64 end = 0;
u64 start = 0;
u64 end = 0;
ret = cache_block_group(root, cache);
if (ret)
goto out;
ret = cache_block_group(root, cache);
if (ret)
goto out;
+ last = max(search_start, cache->key.objectid);
+
while(1) {
ret = find_first_extent_bit(&root->fs_info->free_space_cache,
last, &start, &end, EXTENT_DIRTY);
while(1) {
ret = find_first_extent_bit(&root->fs_info->free_space_cache,
last, &start, &end, EXTENT_DIRTY);
+ if (ret) {
+ goto new_group;
+ }
start = max(last, start);
last = end + 1;
start = max(last, start);
last = end + 1;
return search_start;
new_group:
return search_start;
new_group:
- cache = btrfs_lookup_block_group(root->fs_info,
- last + cache->key.offset - 1);
+ last = cache->key.objectid + cache->key.offset;
+ cache = btrfs_lookup_block_group(root->fs_info, last);
if (!cache) {
return search_start;
}
if (!cache) {
return search_start;
}
- cache = btrfs_find_block_group(root, cache,
- last + cache->key.offset - 1, data, 0);
+ cache = btrfs_find_block_group(root, cache, last, data, 0);
- last = min(cache->key.objectid, last);
if (used < div_factor(hint->key.offset, factor)) {
return hint;
}
if (used < div_factor(hint->key.offset, factor)) {
return hint;
}
- last = hint->key.offset * 3;
- 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;
+ last = hint->key.objectid + hint->key.offset;
hint_last = last;
} else {
if (hint)
hint_last = last;
} else {
if (hint)
check_failed:
search_start = find_search_start(root, &block_group,
search_start, total_needed, data);
check_failed:
search_start = find_search_start(root, &block_group,
search_start, total_needed, data);
btrfs_init_path(path);
ins->objectid = search_start;
ins->offset = 0;
btrfs_init_path(path);
ins->objectid = search_start;
ins->offset = 0;
continue;
if (ret < 0)
goto error;
continue;
if (ret < 0)
goto error;
+
+ search_start = max(search_start,
+ block_group->key.objectid);
if (!start_found) {
ins->objectid = search_start;
ins->offset = search_end - search_start;
if (!start_found) {
ins->objectid = search_start;
ins->offset = search_end - search_start;
ins->objectid = last_byte > search_start ?
last_byte : search_start;
ins->offset = search_end - ins->objectid;
ins->objectid = last_byte > search_start ?
last_byte : search_start;
ins->offset = search_end - ins->objectid;
+ BUG_ON(ins->objectid >= search_end);
goto check_pending;
}
btrfs_item_key_to_cpu(l, &key, slot);
goto check_pending;
}
btrfs_item_key_to_cpu(l, &key, slot);
block_group->key.offset) {
btrfs_release_path(root, path);
search_start = block_group->key.objectid +
block_group->key.offset) {
btrfs_release_path(root, path);
search_start = block_group->key.objectid +
- block_group->key.offset * 2;
+ block_group->key.offset;
if (ins->objectid + num_bytes >= search_end)
goto enospc;
if (ins->objectid + num_bytes >= search_end)
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,
ins->objectid + num_bytes -1, EXTENT_LOCKED, 0)) {
search_start = ins->objectid + num_bytes;
if (test_range_bit(&info->extent_ins, ins->objectid,
ins->objectid + num_bytes -1, EXTENT_LOCKED, 0)) {
search_start = ins->objectid + num_bytes;
set_extent_bits(&root->fs_info->extent_ins, ins->objectid,
ins->objectid + ins->offset - 1,
EXTENT_LOCKED, GFP_NOFS);
set_extent_bits(&root->fs_info->extent_ins, ins->objectid,
ins->objectid + ins->offset - 1,
EXTENT_LOCKED, GFP_NOFS);
struct extent_state *state;
int ret = 1;
struct extent_state *state;
int ret = 1;
- write_lock_irq(&tree->lock);
+ read_lock_irq(&tree->lock);
/*
* this search will find all the extents that end after
* our range starts.
/*
* this search will find all the extents that end after
* our range starts.
while(1) {
state = rb_entry(node, struct extent_state, rb_node);
while(1) {
state = rb_entry(node, struct extent_state, rb_node);
- if (state->state & bits) {
+ if (state->end >= start && (state->state & bits)) {
*start_ret = state->start;
*end_ret = state->end;
ret = 0;
*start_ret = state->start;
*end_ret = state->end;
ret = 0;
- write_unlock_irq(&tree->lock);
+ read_unlock_irq(&tree->lock);
return ret;
}
EXPORT_SYMBOL(find_first_extent_bit);
return ret;
}
EXPORT_SYMBOL(find_first_extent_bit);