From: Nikolay Borisov Date: Thu, 8 Oct 2020 12:24:29 +0000 (+0300) Subject: btrfs: record delta directly in transaction_kthread X-Git-Tag: v5.11-rc1~144^2~194 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=643900bee4141e1b1c47dce93973a0d1a314d8a5;p=thirdparty%2Flinux.git btrfs: record delta directly in transaction_kthread Rename 'now' to 'delta' and store there the delta between transaction start time and current time. This is in preparation for optimising the sleep logic in the next patch. No functional changes. Signed-off-by: Nikolay Borisov Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 3f2c5c05359e9..813d1d5e69273 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1774,7 +1774,7 @@ static int transaction_kthread(void *arg) struct btrfs_trans_handle *trans; struct btrfs_transaction *cur; u64 transid; - time64_t now; + time64_t delta; unsigned long delay; bool cannot_commit; @@ -1790,9 +1790,9 @@ static int transaction_kthread(void *arg) goto sleep; } - now = ktime_get_seconds(); + delta = ktime_get_seconds() - cur->start_time; if (cur->state < TRANS_STATE_COMMIT_START && - now - cur->start_time < fs_info->commit_interval) { + delta < fs_info->commit_interval) { spin_unlock(&fs_info->trans_lock); delay = msecs_to_jiffies(5000); goto sleep;