Commit 44734ed1 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason

Btrfs: don't commit instead of overcommitting

I don't think we have the same problem that this was supposed to fix
originally since we can allocate chunks in the enospc path now.  This code
is causing us to constantly commit the transaction as we get close to using
all of our available space in our currently allocated chunks, instead of
allocating another chunk and carrying on with life, which is not nice for
performance.  Thanks,
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent f0bd95ea
...@@ -3907,7 +3907,6 @@ static int reserve_metadata_bytes(struct btrfs_root *root, ...@@ -3907,7 +3907,6 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
int flush_state = FLUSH_DELAYED_ITEMS_NR; int flush_state = FLUSH_DELAYED_ITEMS_NR;
int ret = 0; int ret = 0;
bool flushing = false; bool flushing = false;
bool committed = false;
again: again:
ret = 0; ret = 0;
...@@ -3970,33 +3969,12 @@ static int reserve_metadata_bytes(struct btrfs_root *root, ...@@ -3970,33 +3969,12 @@ static int reserve_metadata_bytes(struct btrfs_root *root,
(orig_bytes * 2); (orig_bytes * 2);
} }
if (ret) { if (ret && can_overcommit(root, space_info, orig_bytes, flush)) {
u64 avail; space_info->bytes_may_use += orig_bytes;
trace_btrfs_space_reservation(root->fs_info, "space_info",
/* space_info->flags, orig_bytes,
* If we have a lot of space that's pinned, don't bother doing 1);
* the overcommit dance yet and just commit the transaction. ret = 0;
*/
avail = (space_info->total_bytes - space_info->bytes_used) * 8;
do_div(avail, 10);
if (space_info->bytes_pinned >= avail && flush && !committed) {
space_info->flush = 1;
flushing = true;
spin_unlock(&space_info->lock);
ret = may_commit_transaction(root, space_info,
orig_bytes, 1);
if (ret)
goto out;
committed = true;
goto again;
}
if (can_overcommit(root, space_info, orig_bytes, flush)) {
space_info->bytes_may_use += orig_bytes;
trace_btrfs_space_reservation(root->fs_info,
"space_info", space_info->flags, orig_bytes, 1);
ret = 0;
}
} }
/* /*
......
Markdown is supported
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