Commit 3e811f05 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds

fs/sysv/inode.c: use ktime_get_real_seconds() for superblock stamp

get_seconds() is deprecated in favor of ktime_get_real_seconds(), which
returns a 64-bit timestamp.

In the SYSV file system, the superblock timestamp is only 32 bits wide,
and it is used to check whether a file system is clean, so the best
solution seems to be to force a wraparound and explicitly convert it to an
unsigned 32-bit value.

This is independent of the inode timestamps that are also 32-bit wide on
disk and that come from current_time().

Link: http://lkml.kernel.org/r/20180713145236.3152513-1-arnd@arndb.deSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d9edcbc4
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
static int sysv_sync_fs(struct super_block *sb, int wait) static int sysv_sync_fs(struct super_block *sb, int wait)
{ {
struct sysv_sb_info *sbi = SYSV_SB(sb); struct sysv_sb_info *sbi = SYSV_SB(sb);
unsigned long time = get_seconds(), old_time; u32 time = (u32)ktime_get_real_seconds(), old_time;
mutex_lock(&sbi->s_lock); mutex_lock(&sbi->s_lock);
...@@ -46,8 +46,8 @@ static int sysv_sync_fs(struct super_block *sb, int wait) ...@@ -46,8 +46,8 @@ static int sysv_sync_fs(struct super_block *sb, int wait)
*/ */
old_time = fs32_to_cpu(sbi, *sbi->s_sb_time); old_time = fs32_to_cpu(sbi, *sbi->s_sb_time);
if (sbi->s_type == FSTYPE_SYSV4) { if (sbi->s_type == FSTYPE_SYSV4) {
if (*sbi->s_sb_state == cpu_to_fs32(sbi, 0x7c269d38 - old_time)) if (*sbi->s_sb_state == cpu_to_fs32(sbi, 0x7c269d38u - old_time))
*sbi->s_sb_state = cpu_to_fs32(sbi, 0x7c269d38 - time); *sbi->s_sb_state = cpu_to_fs32(sbi, 0x7c269d38u - time);
*sbi->s_sb_time = cpu_to_fs32(sbi, time); *sbi->s_sb_time = cpu_to_fs32(sbi, time);
mark_buffer_dirty(sbi->s_bh2); mark_buffer_dirty(sbi->s_bh2);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment