mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Theodore Ts'o <tytso@mit.edu>,
	Andreas Dilger <adilger.kernel@dilger.ca>,
	Jan Kara <jack@suse.com>
Cc: y2038@lists.linaro.org, linux-ext4@vger.kernel.org,
	Arnd Bergmann <arnd@arndb.de>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/6] ext4: use 64-bit timestamps for mmp_time
Date: Wed, 20 Jun 2018 17:32:59 +0200	[thread overview]
Message-ID: <20180620153322.54221-2-arnd@arndb.de> (raw)
In-Reply-To: <20180620153322.54221-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.

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


  reply	other threads:[~2018-06-20 15:33 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-20 15:32 [PATCH 1/6] ext4: sysfs: print ext4_super_block fields as little-endian Arnd Bergmann
2018-06-20 15:32 ` Arnd Bergmann [this message]
2018-06-21 17:20   ` [PATCH 2/6] ext4: use 64-bit timestamps for mmp_time Andreas Dilger
2018-06-22  7:38   ` Jan Kara
2018-06-20 15:33 ` [PATCH 3/6] ext4: use ktime_get_real_seconds for i_dtime Arnd Bergmann
2018-06-21 17:27   ` Andreas Dilger
2018-06-21 20:07     ` Arnd Bergmann
2018-06-20 15:33 ` [PATCH 4/6] ext4: use timespec64 for all inode times Arnd Bergmann
2018-06-21 17:29   ` Andreas Dilger
2018-06-22  7:37   ` Jan Kara
2018-06-22  8:15     ` Arnd Bergmann
2018-06-20 15:33 ` [PATCH 5/6] jbd2: replace current_kernel_time64 with ktime equivalent Arnd Bergmann
2018-06-21 17:32   ` Andreas Dilger
2018-06-22  7:41   ` Jan Kara
2018-06-20 15:33 ` [PATCH 6/6] [RFC] ext4: super: extend timestamps to 40 bits Arnd Bergmann
2018-06-21 17:46   ` Andreas Dilger
2018-06-21 20:17     ` Arnd Bergmann
2018-06-21 17:49 ` [PATCH 1/6] ext4: sysfs: print ext4_super_block fields as little-endian Andreas Dilger
2018-06-21 20:07   ` Arnd Bergmann

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=20180620153322.54221-2-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=adilger.kernel@dilger.ca \
    --cc=jack@suse.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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

Powered by JetHome