zfs-linux-hardened/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch

20 lines
541 B
Diff

diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h
index f17f1153260..068c9eaf173 100644
--- a/include/zpios-ctl.h
+++ b/include/zpios-ctl.h
@@ -181,9 +181,12 @@ zpios_timespec_t
zpios_timespec_now(void)
{
zpios_timespec_t zts_now;
- struct timespec ts_now;
+ #if defined(HAVE_INODE_TIMESPEC64_TIMES)
+ inode_timespec_t ts_now = current_kernel_time64();
+ #else
+ inode_timespec_t ts_now = current_kernel_time();
+ #endif
- ts_now = current_kernel_time();
zts_now.ts_sec = ts_now.tv_sec;
zts_now.ts_nsec = ts_now.tv_nsec;