From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 19/23] btrfs: don't pass bytes_needed to may_commit_transaction
Date: Fri, 31 Jan 2020 17:36:09 -0500 [thread overview]
Message-ID: <20200131223613.490779-20-josef@toxicpanda.com> (raw)
In-Reply-To: <20200131223613.490779-1-josef@toxicpanda.com>
This was put into place in order to mirror the way data flushing handled
committing the transaction. Now that we do not loop on committing the
transaction simply force a transaction commit if we are data.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/space-info.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 3060754a3341..cef14a4d4167 100644
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -412,14 +412,14 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info,
* will return -ENOSPC.
*/
static int may_commit_transaction(struct btrfs_fs_info *fs_info,
- struct btrfs_space_info *space_info,
- u64 bytes_needed)
+ struct btrfs_space_info *space_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 reclaim_bytes = 0;
+ u64 bytes_needed;
u64 cur_free_bytes = 0;
bool do_commit = false;
@@ -428,12 +428,10 @@ static int may_commit_transaction(struct btrfs_fs_info *fs_info,
return -EAGAIN;
/*
- * If we are data and have passed in U64_MAX we just want to
- * unconditionally commit the transaction to match the previous data
- * flushing behavior.
+ * If we are data just force the commit, we aren't likely to do this
+ * over and over again.
*/
- if ((space_info->flags & BTRFS_BLOCK_GROUP_DATA) &&
- bytes_needed == U64_MAX) {
+ if (space_info->flags & BTRFS_BLOCK_GROUP_DATA) {
do_commit = true;
goto check_pinned;
}
@@ -451,7 +449,7 @@ 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_needed = (ticket) ? ticket->bytes : bytes_needed;
+ bytes_needed = (ticket) ? ticket->bytes : 0;
if (bytes_needed > cur_free_bytes)
bytes_needed -= cur_free_bytes;
@@ -584,7 +582,7 @@ static void flush_space(struct btrfs_fs_info *fs_info,
btrfs_wait_on_delayed_iputs(fs_info);
break;
case COMMIT_TRANS:
- ret = may_commit_transaction(fs_info, space_info, num_bytes);
+ ret = may_commit_transaction(fs_info, space_info);
break;
default:
ret = -ENOSPC;
--
2.24.1
next prev parent reply other threads:[~2020-01-31 22:36 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-31 22:35 [PATCH 00/23][v2] Convert data reservations to the ticketing infrastructure Josef Bacik
2020-01-31 22:35 ` [PATCH 01/23] btrfs: change nr to u64 in btrfs_start_delalloc_roots Josef Bacik
2020-02-03 10:45 ` Johannes Thumshirn
2020-02-03 11:15 ` Nikolay Borisov
2020-01-31 22:35 ` [PATCH 02/23] btrfs: remove orig from shrink_delalloc Josef Bacik
2020-02-03 10:46 ` Johannes Thumshirn
2020-01-31 22:35 ` [PATCH 03/23] btrfs: handle U64_MAX for shrink_delalloc Josef Bacik
2020-02-03 11:01 ` Johannes Thumshirn
2020-02-03 11:05 ` Johannes Thumshirn
2020-01-31 22:35 ` [PATCH 04/23] btrfs: make shrink_delalloc take space_info as an arg Josef Bacik
2020-02-03 10:53 ` Johannes Thumshirn
2020-01-31 22:35 ` [PATCH 05/23] btrfs: make ALLOC_CHUNK use the space info flags Josef Bacik
2020-02-03 11:19 ` Johannes Thumshirn
2020-01-31 22:35 ` [PATCH 06/23] btrfs: call btrfs_try_granting_tickets when freeing reserved bytes Josef Bacik
2020-01-31 22:35 ` [PATCH 07/23] btrfs: call btrfs_try_granting_tickets when unpinning anything Josef Bacik
2020-02-03 11:24 ` Johannes Thumshirn
2020-01-31 22:35 ` [PATCH 08/23] btrfs: call btrfs_try_granting_tickets when reserving space Josef Bacik
2020-01-31 22:35 ` [PATCH 09/23] btrfs: use the btrfs_space_info_free_bytes_may_use helper for delalloc Josef Bacik
2020-02-03 14:46 ` Johannes Thumshirn
2020-01-31 22:36 ` [PATCH 10/23] btrfs: use btrfs_start_delalloc_roots in shrink_delalloc Josef Bacik
2020-02-03 12:03 ` Nikolay Borisov
2020-01-31 22:36 ` [PATCH 11/23] btrfs: check tickets after waiting on ordered extents Josef Bacik
2020-02-03 13:10 ` Nikolay Borisov
2020-02-03 15:57 ` Josef Bacik
2020-01-31 22:36 ` [PATCH 12/23] btrfs: add the data transaction commit logic into may_commit_transaction Josef Bacik
2020-02-03 14:00 ` Nikolay Borisov
2020-01-31 22:36 ` [PATCH 13/23] btrfs: add flushing states for handling data reservations Josef Bacik
2020-02-03 14:00 ` Nikolay Borisov
2020-01-31 22:36 ` [PATCH 14/23] btrfs: add btrfs_reserve_data_bytes and use it Josef Bacik
2020-02-03 14:20 ` Nikolay Borisov
2020-01-31 22:36 ` [PATCH 15/23] btrfs: use ticketing for data space reservations Josef Bacik
2020-02-03 14:29 ` Nikolay Borisov
2020-01-31 22:36 ` [PATCH 16/23] btrfs: serialize data reservations if we are flushing Josef Bacik
2020-02-03 15:06 ` Nikolay Borisov
2020-01-31 22:36 ` [PATCH 17/23] btrfs: use the same helper for data and metadata reservations Josef Bacik
2020-02-03 15:47 ` Nikolay Borisov
2020-01-31 22:36 ` [PATCH 18/23] btrfs: drop the commit_cycles stuff for data reservations Josef Bacik
2020-02-03 16:02 ` Nikolay Borisov
2020-01-31 22:36 ` Josef Bacik [this message]
2020-02-03 16:10 ` [PATCH 19/23] btrfs: don't pass bytes_needed to may_commit_transaction Nikolay Borisov
2020-01-31 22:36 ` [PATCH 20/23] btrfs: don't force commit if we are data Josef Bacik
2020-02-03 16:12 ` Nikolay Borisov
2020-01-31 22:36 ` [PATCH 21/23] btrfs: run delayed iputs before committing the transaction for data Josef Bacik
2020-02-03 16:13 ` Nikolay Borisov
2020-01-31 22:36 ` [PATCH 22/23] btrfs: flush delayed refs when trying to reserve data space Josef Bacik
2020-02-03 16:16 ` Nikolay Borisov
2020-02-03 16:24 ` Josef Bacik
2020-01-31 22:36 ` [PATCH 23/23] btrfs: do async reclaim for data reservations Josef Bacik
2020-02-03 17:19 ` Nikolay Borisov
2020-02-03 18:51 ` Josef Bacik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200131223613.490779-20-josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox