From 82c0a050fcaa50c2d35e562858fa5c95e05caecd Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 31 Oct 2018 11:50:42 -0500 Subject: [PATCH] Linux 4.20 compat: current_kernel_time() Commit torvalds/linux@976516404 removed the current_kernel_time() function (and several others). All callers are expected to use current_kernel_time64(). Update the gethrestime_sec() wrapper accordingly. Reviewed-by: Olaf Faaland Reviewed-by: Tony Hutter Signed-off-by: Brian Behlendorf Closes #8074 --- include/spl/sys/time.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/spl/sys/time.h b/include/spl/sys/time.h index 37f5e35df..1a986c9b9 100644 --- a/include/spl/sys/time.h +++ b/include/spl/sys/time.h @@ -82,8 +82,11 @@ gethrestime(inode_timespec_t *ts) static inline time_t gethrestime_sec(void) { - struct timespec ts; - ts = current_kernel_time(); +#if defined(HAVE_INODE_TIMESPEC64_TIMES) + inode_timespec_t ts = current_kernel_time64(); +#else + inode_timespec_t ts = current_kernel_time(); +#endif return (ts.tv_sec); }