diff options
| author |   Josef Bacik <josef@toxicpanda.com> | 2021-11-05 16:45:28 -0400 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2022-01-03 15:09:46 +0100 |
| commit | fdfbf020664b92336ac4f554ffec2d2f890960b9 (patch) | |
| tree | 889133fe4b965a8d4022af746869afe97eced0c8 /fs/btrfs/disk-io.c | |
| parent | btrfs: remove unused BTRFS_FS_BARRIER flag (diff) | |
| download | linux-dev-fdfbf020664b92336ac4f554ffec2d2f890960b9.tar.xz linux-dev-fdfbf020664b92336ac4f554ffec2d2f890960b9.zip | |
btrfs: rework async transaction committing
Currently we do this awful thing where we get another ref on a trans
handle, async off that handle and commit the transaction from that work.
Because we do this we have to mess with current->journal_info and the
freeze counting stuff.
We already have an async thing to kick for the transaction commit, the
transaction kthread. Replace this work struct with a flag on the
fs_info to tell the kthread to go ahead and commit even if it's before
our timeout. Then we can drastically simplify the async transaction
commit path.
Note: this can be simplified and functionality based on the pending
operation COMMIT.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
[ add note ]
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index de323878e85c..9683b507be50 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1934,7 +1934,8 @@ static int transaction_kthread(void *arg) } delta = ktime_get_seconds() - cur->start_time; - if (cur->state < TRANS_STATE_COMMIT_START && + if (!test_and_clear_bit(BTRFS_FS_COMMIT_TRANS, &fs_info->flags) && + cur->state < TRANS_STATE_COMMIT_START && delta < fs_info->commit_interval) { spin_unlock(&fs_info->trans_lock); delay -= msecs_to_jiffies((delta - 1) * 1000); |