From: Arnd Bergmann <arnd@arndb.de>
To: adilger.kernel@dilger.ca
Cc: arnd@arndb.de, jack@suse.cz, linux-ext4@vger.kernel.org,
linux-kernel@vger.kernel.org, sirmy15@gmail.com,
stable@vger.kernel.org, tgnottingham@gmail.com, tytso@mit.edu,
y2038@lists.linaro.org
Subject: [PATCH v2 4/6] ext4: use timespec64 for all inode times
Date: Wed, 11 Jul 2018 11:14:12 +0200 [thread overview]
Message-ID: <20180711091414.1494843-4-arnd@arndb.de> (raw)
In-Reply-To: <20180711091414.1494843-1-arnd@arndb.de>
This is the last missing piece for the inode times on 32-bit systems:
now that VFS interfaces use timespec64, we just need to stop truncating
the tv_sec values for y2038 compatibililty.
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
fs/ext4/ext4.h | 22 +++++++++-------------
fs/ext4/ialloc.c | 2 +-
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index d79d1a54a27e..f71ccafe8f9f 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -789,17 +789,16 @@ struct move_extent {
* affected filesystem before 2242.
*/
-static inline __le32 ext4_encode_extra_time(struct timespec *time)
+static inline __le32 ext4_encode_extra_time(struct timespec64 *time)
{
- u32 extra = sizeof(time->tv_sec) > 4 ?
- ((time->tv_sec - (s32)time->tv_sec) >> 32) & EXT4_EPOCH_MASK : 0;
+ u32 extra =((time->tv_sec - (s32)time->tv_sec) >> 32) & EXT4_EPOCH_MASK;
return cpu_to_le32(extra | (time->tv_nsec << EXT4_EPOCH_BITS));
}
-static inline void ext4_decode_extra_time(struct timespec *time, __le32 extra)
+static inline void ext4_decode_extra_time(struct timespec64 *time,
+ __le32 extra)
{
- if (unlikely(sizeof(time->tv_sec) > 4 &&
- (extra & cpu_to_le32(EXT4_EPOCH_MASK)))) {
+ if (unlikely(extra & cpu_to_le32(EXT4_EPOCH_MASK))) {
#if 1
/* Handle legacy encoding of pre-1970 dates with epoch
@@ -821,9 +820,8 @@ static inline void ext4_decode_extra_time(struct timespec *time, __le32 extra)
do { \
(raw_inode)->xtime = cpu_to_le32((inode)->xtime.tv_sec); \
if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra)) {\
- struct timespec ts = timespec64_to_timespec((inode)->xtime); \
(raw_inode)->xtime ## _extra = \
- ext4_encode_extra_time(&ts); \
+ ext4_encode_extra_time(&(inode)->xtime); \
} \
} while (0)
@@ -840,10 +838,8 @@ do { \
do { \
(inode)->xtime.tv_sec = (signed)le32_to_cpu((raw_inode)->xtime); \
if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), xtime ## _extra)) { \
- struct timespec ts = timespec64_to_timespec((inode)->xtime); \
- ext4_decode_extra_time(&ts, \
+ ext4_decode_extra_time(&(inode)->xtime, \
raw_inode->xtime ## _extra); \
- (inode)->xtime = timespec_to_timespec64(ts); \
} \
else \
(inode)->xtime.tv_nsec = 0; \
@@ -993,9 +989,9 @@ struct ext4_inode_info {
/*
* File creation time. Its function is same as that of
- * struct timespec i_{a,c,m}time in the generic inode.
+ * struct timespec64 i_{a,c,m}time in the generic inode.
*/
- struct timespec i_crtime;
+ struct timespec64 i_crtime;
/* mballoc */
struct list_head i_prealloc_list;
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index fb83750c1a14..18c37c43751c 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -1083,7 +1083,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
/* This is the optimal IO size (for stat), not the fs block size */
inode->i_blocks = 0;
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
- ei->i_crtime = timespec64_to_timespec(inode->i_mtime);
+ ei->i_crtime = inode->i_mtime;
memset(ei->i_data, 0, sizeof(ei->i_data));
ei->i_dir_start_lookup = 0;
--
2.9.0
next prev parent reply other threads:[~2018-07-11 9:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 9:14 [PATCH v2 1/6] ext4: sysfs: print ext4_super_block fields as little-endian Arnd Bergmann
2018-07-11 9:14 ` [PATCH v2 2/6] ext4: use 64-bit timestamps for mmp_time Arnd Bergmann
2018-07-22 18:06 ` Theodore Y. Ts'o
2018-07-11 9:14 ` [PATCH v2 3/6] ext4: use ktime_get_real_seconds for i_dtime Arnd Bergmann
2018-07-22 18:07 ` Theodore Y. Ts'o
2018-07-11 9:14 ` Arnd Bergmann [this message]
2018-07-22 18:08 ` [PATCH v2 4/6] ext4: use timespec64 for all inode times Theodore Y. Ts'o
2018-07-11 9:14 ` [PATCH v2 5/6] jbd2: replace current_kernel_time64 with ktime equivalent Arnd Bergmann
2018-07-22 18:54 ` Theodore Y. Ts'o
2018-07-11 9:14 ` [PATCH v2 6/6] ext4: super: extend timestamps to 40 bits Arnd Bergmann
2018-07-22 18:55 ` Theodore Y. Ts'o
2018-07-22 17:23 ` [PATCH v2 1/6] ext4: sysfs: print ext4_super_block fields as little-endian Theodore Y. Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180711091414.1494843-4-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sirmy15@gmail.com \
--cc=stable@vger.kernel.org \
--cc=tgnottingham@gmail.com \
--cc=tytso@mit.edu \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®