Skip to content

Commit

Permalink
btrfs: update may_commit_transaction to use the delayed refs rsv
Browse files Browse the repository at this point in the history
Any space used in the delayed_refs_rsv will be freed up by a transaction
commit, so instead of just counting the pinned space we also need to
account for any space in the delayed_refs_rsv when deciding if it will
make a different to commit the transaction to satisfy our space
reservation.  If we have enough bytes to satisfy our reservation ticket
then we are good to go, otherwise subtract out what space we would gain
back by committing the transaction and compare that against the pinned
space to make our decision.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Josef Bacik authored and David Sterba committed Dec 17, 2018
1 parent ba2c4d4 commit 4c8edbc
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions fs/btrfs/extent-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -4843,8 +4843,10 @@ static int may_commit_transaction(struct btrfs_fs_info *fs_info,
{
struct reserve_ticket *ticket = NULL;
struct btrfs_block_rsv *delayed_rsv = &fs_info->delayed_block_rsv;
struct btrfs_block_rsv *delayed_refs_rsv = &fs_info->delayed_refs_rsv;
struct btrfs_trans_handle *trans;
u64 bytes;
u64 bytes_needed;
u64 reclaim_bytes = 0;

trans = (struct btrfs_trans_handle *)current->journal_info;
if (trans)
Expand All @@ -4857,15 +4859,15 @@ static int may_commit_transaction(struct btrfs_fs_info *fs_info,
else if (!list_empty(&space_info->tickets))
ticket = list_first_entry(&space_info->tickets,
struct reserve_ticket, list);
bytes = (ticket) ? ticket->bytes : 0;
bytes_needed = (ticket) ? ticket->bytes : 0;
spin_unlock(&space_info->lock);

if (!bytes)
if (!bytes_needed)
return 0;

/* See if there is enough pinned space to make this reservation */
if (__percpu_counter_compare(&space_info->total_bytes_pinned,
bytes,
bytes_needed,
BTRFS_TOTAL_BYTES_PINNED_BATCH) >= 0)
goto commit;

Expand All @@ -4877,14 +4879,18 @@ static int may_commit_transaction(struct btrfs_fs_info *fs_info,
return -ENOSPC;

spin_lock(&delayed_rsv->lock);
if (delayed_rsv->size > bytes)
bytes = 0;
else
bytes -= delayed_rsv->size;
reclaim_bytes += delayed_rsv->reserved;
spin_unlock(&delayed_rsv->lock);

spin_lock(&delayed_refs_rsv->lock);
reclaim_bytes += delayed_refs_rsv->reserved;
spin_unlock(&delayed_refs_rsv->lock);
if (reclaim_bytes >= bytes_needed)
goto commit;
bytes_needed -= reclaim_bytes;

if (__percpu_counter_compare(&space_info->total_bytes_pinned,
bytes,
bytes_needed,
BTRFS_TOTAL_BYTES_PINNED_BATCH) < 0) {
return -ENOSPC;
}
Expand Down

0 comments on commit 4c8edbc

Please sign in to comment.