Commit 8a1413a2 authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: empty_size allocation fixes again



The allocator wasn't catching all of the cases where it needed to do
extra loops because the check to enforce them wasn't happening early
enough.

When the allocator decided to increase the size of the allocation
for metadata clustering, it wasn't always setting the empty_size to
include the extra (optional) bytes.  This also fixes the empty_size field
to be correct.
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 240d5d48
......@@ -2174,6 +2174,9 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
* group thats not of the proper type, while looping this
* should never happen
*/
if (empty_size)
extra_loop = 1;
if (!block_group)
goto new_group_no_lock;
......@@ -2192,9 +2195,6 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
free_space = btrfs_find_free_space(block_group, search_start,
total_needed);
if (empty_size)
extra_loop = 1;
if (free_space) {
u64 start = block_group->key.objectid;
u64 end = block_group->key.objectid +
......@@ -2212,6 +2212,7 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
if (last_wanted && search_start != last_wanted) {
total_needed += empty_cluster;
empty_size += empty_cluster;
last_wanted = 0;
/*
* if search_start is still in this block group
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment