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

Btrfs: Fix handling of space info full during allocations

Browse Source 
When we fail to allocate a new block group, we should still do the
checks to make sure allocations try again with the minimum requested
allocation size.

This also fixes a deadlock that come from a missed down_read in
the chunk allocation failure handling.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason
2008-11-13 09:59:33 -05:00
parent 6f3577bdc7
commit 2ed6d66408
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2301,9 +2301,9 @@ new_group_no_lock:
up_read(&space_info->groups_sem); up_read(&space_info->groups_sem);
ret = do_chunk_alloc(trans, root, num_bytes + ret = do_chunk_alloc(trans, root, num_bytes +
2 * 1024 * 1024, data, 1); 2 * 1024 * 1024, data, 1);
if (ret < 0)
break;
down_read(&space_info->groups_sem); down_read(&space_info->groups_sem);
if (ret < 0)
goto loop_check;
head = &space_info->block_groups; head = &space_info->block_groups;
/* /*
* we've allocated a new chunk, keep * we've allocated a new chunk, keep
@@ -2314,6 +2314,7 @@ new_group_no_lock:
} else if (!allowed_chunk_alloc) { } else if (!allowed_chunk_alloc) {
space_info->force_alloc = 1; space_info->force_alloc = 1;
} }
loop_check:
if (keep_going) { if (keep_going) {
cur = head->next; cur = head->next;
extra_loop = 0; extra_loop = 0;