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 /module/zfs/zfs_znode.c | |
| 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 'module/zfs/zfs_znode.c')
| -rw-r--r-- | module/zfs/zfs_znode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c index bb18c1b9a..f037d4c96 100644 --- a/module/zfs/zfs_znode.c +++ b/module/zfs/zfs_znode.c @@ -698,7 +698,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, uint64_t rdev = 0; zfsvfs_t *zfsvfs = ZTOZSB(dzp); dmu_buf_t *db; - timestruc_t now; + inode_timespec_t now; uint64_t gen, obj; int bonuslen; int dnodesize; @@ -1403,7 +1403,7 @@ void zfs_tstamp_update_setup(znode_t *zp, uint_t flag, uint64_t mtime[2], uint64_t ctime[2]) { - timestruc_t now; + inode_timespec_t now; gethrestime(&now); |