diff mbox series

[v2,2/6] ext4: use 64-bit timestamps for mmp_time

Message ID 20180711091414.1494843-2-arnd@arndb.de
State Accepted
Commit af123b3718592a66a24716ed4724dc214220492b
Headers show
Series None | expand

Commit Message

Arnd Bergmann July 11, 2018, 9:14 a.m. UTC 
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(-)

-- 
2.9.0

Comments

Theodore Ts'o July 22, 2018, 6:06 p.m. UTC | #1 
On Wed, Jul 11, 2018 at 11:14:10AM +0200, Arnd Bergmann wrote:
> 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>


Thanks, applied.

					- Ted
diff mbox series

Patch

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);