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 2/6] ext4: use 64-bit timestamps for mmp_time
Date: Wed, 11 Jul 2018 11:14:10 +0200 [thread overview]
Message-ID: <20180711091414.1494843-2-arnd@arndb.de> (raw)
In-Reply-To: <20180711091414.1494843-1-arnd@arndb.de>
The mmp_time field is 64 bits wide, which is good, but calling
get_seconds() results in a 32-bit value on 32-bit architectures. Using
ktime_get_real_seconds() instead returns 64 bits everywhere.
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
fs/ext4/mmp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
index 27b9a76a0dfa..39da4eb48361 100644
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c
@@ -147,7 +147,7 @@ static int kmmpd(void *data)
mmp_block = le64_to_cpu(es->s_mmp_block);
mmp = (struct mmp_struct *)(bh->b_data);
- mmp->mmp_time = cpu_to_le64(get_seconds());
+ mmp->mmp_time = cpu_to_le64(ktime_get_real_seconds());
/*
* Start with the higher mmp_check_interval and reduce it if
* the MMP block is being updated on time.
@@ -165,7 +165,7 @@ static int kmmpd(void *data)
seq = 1;
mmp->mmp_seq = cpu_to_le32(seq);
- mmp->mmp_time = cpu_to_le64(get_seconds());
+ mmp->mmp_time = cpu_to_le64(ktime_get_real_seconds());
last_update_time = jiffies;
retval = write_mmp_block(sb, bh);
@@ -244,7 +244,7 @@ static int kmmpd(void *data)
* Unmount seems to be clean.
*/
mmp->mmp_seq = cpu_to_le32(EXT4_MMP_SEQ_CLEAN);
- mmp->mmp_time = cpu_to_le64(get_seconds());
+ mmp->mmp_time = cpu_to_le64(ktime_get_real_seconds());
retval = write_mmp_block(sb, bh);
--
2.9.0
next prev parent reply other threads:[~2018-07-11 9:14 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 ` Arnd Bergmann [this message]
2018-07-22 18:06 ` [PATCH v2 2/6] ext4: use 64-bit timestamps for mmp_time 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 ` [PATCH v2 4/6] ext4: use timespec64 for all inode times Arnd Bergmann
2018-07-22 18:08 ` 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-2-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®