Linux 4.18 compat: inode timespec -> timespec64 #7643
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
behlendorf
added
the
Type: Building
behlendorf
force-pushed
the
linux-4.18
branch
2 times, most recently
from
cca6ca5
to
f792d6e
Compare
tuxoko
reviewed
Jun 19, 2018
module/zfs/zpl_ctldir.c
Outdated
| @@ -388,7 +388,8 @@ zpl_snapdir_getattr_impl(const struct path *path, struct kstat *stat, | |||
| generic_fillattr(ip, stat); | |||
|
|
|||
| stat->nlink = stat->size = 2; | |||
| stat->ctime = stat->mtime = dmu_objset_snap_cmtime(zfsvfs->z_os); | |||
| stat->ctime = stat->mtime = zpl_inode_set_timespec( | |||
| dmu_objset_snap_cmtime(zfsvfs->z_os)); | |||
There was a problem hiding this comment.
Can we make this timespec64 as well?
module/zfs/zfs_znode.c
Outdated
| obj = vap->va_nodeid; | ||
| now = vap->va_ctime; /* see zfs_replay_create() */ | ||
| now = zpl_inode_get_timespec(vap->va_ctime); |
There was a problem hiding this comment.
Can we make this timespec64 as well?
include/sys/zfs_znode.h
Outdated
| (tp)->tv_sec = (time_t)(stmp)[0]; \ | ||
| (tp)->tv_nsec = (long)(stmp)[1]; \ | ||
| (tp)->tv_sec = (time_t)(stmp)[0]; \ | ||
| (tp)->tv_nsec = (long)(stmp)[1]; \ | ||
| } |
There was a problem hiding this comment.
We can take this opportunity to change these macro to do { } while (0)
Codecov Report
@@ Coverage Diff @@
## master #7643 +/- ##
==========================================
+ Coverage 77.52% 77.7% +0.17%
==========================================
Files 363 362 -1
Lines 110519 110516 -3
==========================================
+ Hits 85683 85874 +191
+ Misses 24836 24642 -194
Continue to review full report at Codecov.
|
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(). Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Yup, we can do better. I've refreshed the PR and took a slightly different approach. A new type was introduced called |
ryao
pushed a commit
to ryao/zfs
that referenced
this pull request
Aug 13, 2018
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 <tuxoko@gmail.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes openzfs#7643 Backported-by: Richard Yao <ryao@gentoo.org>
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 15, 2018
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 <tuxoko@gmail.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes openzfs#7643 Backported-by: Richard Yao <ryao@gentoo.org>
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Aug 23, 2018
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 <tuxoko@gmail.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes openzfs#7643 Backported-by: Richard Yao <ryao@gentoo.org>
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Sep 5, 2018
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 <tuxoko@gmail.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes openzfs#7643 Backported-by: Richard Yao <ryao@gentoo.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
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().
Motivation and Context
Support the latest kernels.
How Has This Been Tested?
Locally built against v4.18-rc1-23-g9ffc59d57228.
Types of changes
Checklist:
Signed-off-by.