Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 167253
b: refs/heads/master
c: 1cdda9b
h: refs/heads/master
i:
  167251: bd7351d
v: v3
  • Loading branch information
Josef Bacik authored and Chris Mason committed Oct 6, 2009
1 parent c9eba7a commit 20341fd
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 61d92c328c16419fc96dc50dd16f8b8c695409ec
refs/heads/master: 1cdda9b81ac0e6ee986f034fa02f221679e1c11a
23 changes: 17 additions & 6 deletions trunk/fs/btrfs/extent-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -4028,6 +4028,7 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans,
int loop = 0;
bool found_uncached_bg = false;
bool failed_cluster_refill = false;
bool failed_alloc = false;

WARN_ON(num_bytes < root->sectorsize);
btrfs_set_key_type(ins, BTRFS_EXTENT_ITEM_KEY);
Expand Down Expand Up @@ -4232,14 +4233,23 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans,

offset = btrfs_find_space_for_alloc(block_group, search_start,
num_bytes, empty_size);
if (!offset && (cached || (!cached &&
loop == LOOP_CACHING_NOWAIT))) {
goto loop;
} else if (!offset && (!cached &&
loop > LOOP_CACHING_NOWAIT)) {
/*
* If we didn't find a chunk, and we haven't failed on this
* block group before, and this block group is in the middle of
* caching and we are ok with waiting, then go ahead and wait
* for progress to be made, and set failed_alloc to true.
*
* If failed_alloc is true then we've already waited on this
* block group once and should move on to the next block group.
*/
if (!offset && !failed_alloc && !cached &&
loop > LOOP_CACHING_NOWAIT) {
wait_block_group_cache_progress(block_group,
num_bytes + empty_size);
num_bytes + empty_size);
failed_alloc = true;
goto have_block_group;
} else if (!offset) {
goto loop;
}
checks:
search_start = stripe_align(root, offset);
Expand Down Expand Up @@ -4287,6 +4297,7 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans,
break;
loop:
failed_cluster_refill = false;
failed_alloc = false;
btrfs_put_block_group(block_group);
}
up_read(&space_info->groups_sem);
Expand Down

0 comments on commit 20341fd

Please sign in to comment.