From 6413c95fbd88dc06ae57e50398b8530a17d0c7d3 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 19 Jun 2018 21:51:18 -0700 Subject: 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 Signed-off-by: Brian Behlendorf Closes #7643 --- module/zfs/zfs_ctldir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/zfs/zfs_ctldir.c') diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c index f0720e58a..baa72863e 100644 --- a/module/zfs/zfs_ctldir.c +++ b/module/zfs/zfs_ctldir.c @@ -448,7 +448,7 @@ static struct inode * zfsctl_inode_alloc(zfsvfs_t *zfsvfs, uint64_t id, const struct file_operations *fops, const struct inode_operations *ops) { - struct timespec now; + inode_timespec_t now; struct inode *ip; znode_t *zp; -- cgit v1.2.3