diff options
| author | Brian Behlendorf <[email protected]> | 2018-08-12 18:22:03 -0400 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2018-07-06 02:46:51 -0700 |
| commit | f79c0de208ad1a4effd5b0a9afc426922b12918a (patch) | |
| tree | faf14cee4ba888106c23bdbb5a12cd23c45768dd /config | |
| parent | 166781608941be963d7b0ffd40c4a785cea5a97f (diff) | |
Linux 4.18 compat: inode timespec -> timespec64
Commit torvalds/linux@95582b0 changes the inode i_atime, i_mtime,
and i_ctime members form timespec's to timespec64's to make them
2038 safe. As part of this change the current_time() function was
also updated to return the timespec64 type.
Resolve this issue by introducing a new inode_timespec_t type which
is defined to match the timespec type used by the inode. It should
be used when working with inode timestamps to ensure matching types.
The timestruc_t type under Illumos was used in a similar fashion but
was specified to always be a timespec_t. Rather than incorrectly
define this type all timespec_t types have been replaced by the new
inode_timespec_t type.
Finally, the kernel and user space 'sys/time.h' headers were aligned
with each other. They define as appropriate for the context several
constants as macros and include static inline implementation of
gethrestime(), gethrestime_sec(), and gethrtime().
Reviewed-by: Chunwei Chen <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #7643
Backported-by: Richard Yao <[email protected]>
Diffstat (limited to 'config')
| -rw-r--r-- | config/kernel-current-time.m4 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config/kernel-current-time.m4 b/config/kernel-current-time.m4 index 2ede9ff38..c7d5c9b52 100644 --- a/config/kernel-current-time.m4 +++ b/config/kernel-current-time.m4 @@ -1,15 +1,14 @@ dnl # dnl # 4.9, current_time() added +dnl # 4.18, return type changed from timespec to timespec64 dnl # AC_DEFUN([ZFS_AC_KERNEL_CURRENT_TIME], [AC_MSG_CHECKING([whether current_time() exists]) ZFS_LINUX_TRY_COMPILE_SYMBOL([ #include <linux/fs.h> ], [ - struct inode ip; - struct timespec now __attribute__ ((unused)); - - now = current_time(&ip); + struct inode ip __attribute__ ((unused)); + ip.i_atime = current_time(&ip); ], [current_time], [fs/inode.c], [ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_CURRENT_TIME, 1, [current_time() exists]) |