diff options
author | Brian Behlendorf <[email protected]> | 2018-06-19 21:51:18 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2018-06-19 21:51:18 -0700 |
commit | 6413c95fbd88dc06ae57e50398b8530a17d0c7d3 (patch) | |
tree | eaa8a5618a917abcf0a4e30e328be4db4bd3e710 /include/sys/zpl.h | |
parent | aeb39df72615b896db2b69921d7d887f1bb0a396 (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
Diffstat (limited to 'include/sys/zpl.h')
-rw-r--r-- | include/sys/zpl.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/sys/zpl.h b/include/sys/zpl.h index 5df7bd1ac..2766269f3 100644 --- a/include/sys/zpl.h +++ b/include/sys/zpl.h @@ -188,4 +188,13 @@ zpl_dir_emit_dots(struct file *file, zpl_dir_context_t *ctx) } #endif /* HAVE_VFS_ITERATE */ +/* + * Linux 4.18, inode times converted from timespec to timespec64. + */ +#if defined(HAVE_INODE_TIMESPEC64_TIMES) +#define zpl_inode_timespec_trunc(ts, gran) timespec64_trunc(ts, gran) +#else +#define zpl_inode_timespec_trunc(ts, gran) timespec_trunc(ts, gran) +#endif + #endif /* _SYS_ZPL_H */ |