From: Arnd Bergmann Date: Sun, 29 Jul 2018 19:51:47 +0000 (-0400) Subject: jbd2: replace current_kernel_time64 with ktime equivalent X-Git-Tag: v4.19~171^2~28 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b42d1d6b5b789c41dacbe2bc192c7b359d109d7b;p=platform%2Fkernel%2Flinux-rpi3.git jbd2: replace current_kernel_time64 with ktime equivalent jbd2 is one of the few callers of current_kernel_time64(), which is a wrapper around ktime_get_coarse_real_ts64(). This calls the latter directly for consistency with the rest of the kernel that is moving to the ktime_get_ family of time accessors. Reviewed-by: Andreas Dilger Reviewed-by: Jan Kara Signed-off-by: Arnd Bergmann Signed-off-by: Theodore Ts'o --- diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 8de0e77..150cc03 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -121,7 +121,7 @@ static int journal_submit_commit_record(journal_t *journal, struct commit_header *tmp; struct buffer_head *bh; int ret; - struct timespec64 now = current_kernel_time64(); + struct timespec64 now; *cbh = NULL; @@ -134,6 +134,7 @@ static int journal_submit_commit_record(journal_t *journal, return 1; tmp = (struct commit_header *)bh->b_data; + ktime_get_coarse_real_ts64(&now); tmp->h_commit_sec = cpu_to_be64(now.tv_sec); tmp->h_commit_nsec = cpu_to_be32(now.tv_nsec);