diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2020-10-20 12:44:17 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-12-08 15:53:36 +0100 |
| commit | fb8a7e941b1b4c1c2fa79b305d4c3fc41ad9bbda (patch) | |
| tree | b921c6141761365c55b10006765cbea053860bc9 /fs/btrfs/disk-io.c | |
| parent | 643900bee4141e1b1c47dce93973a0d1a314d8a5 (diff) | |
| download | linux-fb8a7e941b1b4c1c2fa79b305d4c3fc41ad9bbda.tar.gz linux-fb8a7e941b1b4c1c2fa79b305d4c3fc41ad9bbda.tar.bz2 linux-fb8a7e941b1b4c1c2fa79b305d4c3fc41ad9bbda.zip | |
btrfs: calculate more accurate remaining time to sleep in transaction_kthread
If transaction_kthread is woken up before btrfs_fs_info::commit_interval
seconds have elapsed it will sleep for a fixed period of 5 seconds. This
is not a problem per-se but is not accurate. Instead the code should
sleep for an interval which guarantees on next wakeup commit_interval
would have passed. Since time tracking is not precise subtract 1 second
from delta to ensure the delay we end up waiting will be longer than
than the wake up period.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 813d1d5e6927..e3caf18dcff4 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1794,7 +1794,9 @@ static int transaction_kthread(void *arg) if (cur->state < TRANS_STATE_COMMIT_START && delta < fs_info->commit_interval) { spin_unlock(&fs_info->trans_lock); - delay = msecs_to_jiffies(5000); + delay -= msecs_to_jiffies((delta - 1) * 1000); + delay = min(delay, + msecs_to_jiffies(fs_info->commit_interval * 1000)); goto sleep; } transid = cur->transid; |