From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 31 Oct 2018 16:50:42 +0000 (-0500)
Subject: Linux 4.20 compat: current_kernel_time()
X-Git-Tag: zfs-0.8.0-rc2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82c0a050fcaa50c2d35e562858fa5c95e05caecd;p=zfs

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 <faaland1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8074
---

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);
 }