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/zfs_context.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/zfs_context.h')
| -rw-r--r-- | include/sys/zfs_context.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h index 31a72ba70..6f502897e 100644 --- a/include/sys/zfs_context.h +++ b/include/sys/zfs_context.h @@ -483,7 +483,7 @@ extern char *vn_dumpdir; #define AV_SCANSTAMP_SZ 32 /* length of anti-virus scanstamp */ typedef struct xoptattr { - timestruc_t xoa_createtime; /* Create time of file */ + inode_timespec_t xoa_createtime; /* Create time of file */ uint8_t xoa_archive; uint8_t xoa_system; uint8_t xoa_readonly; @@ -596,13 +596,6 @@ extern void delay(clock_t ticks); #define USEC_TO_TICK(usec) ((usec) / (MICROSEC / hz)) #define NSEC_TO_TICK(usec) ((usec) / (NANOSEC / hz)) -#define gethrestime_sec() time(NULL) -#define gethrestime(t) \ - do {\ - (t)->tv_sec = gethrestime_sec();\ - (t)->tv_nsec = 0;\ - } while (0); - #define max_ncpus 64 #define boot_ncpus (sysconf(_SC_NPROCESSORS_ONLN)) |