Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs/ufs: use ktime_get_real_seconds for sb and cg timestamps

get_seconds() is deprecated because of the 32-bit overflow and will be
removed. All callers in ufs also truncate to a 32-bit number, so
nothing changes during the conversion, but this should be harmless as
the superblock and cylinder group timestamps are not visible to user
space, except for checking the fs-dirty state, wich works fine across
the overflow.

This moves the call to get_seconds() into a new inline function, with a
comment explaining the constraints, while converting it to
ktime_get_real_seconds().

Link: http://lkml.kernel.org/r/20180718115017.742609-1-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Arnd Bergmann and committed by
Linus Torvalds
a3fda0ff 2c1bb29a

+19 -5
+2 -2
fs/ufs/balloc.c
··· 547 547 /* 548 548 * Block can be extended 549 549 */ 550 - ucg->cg_time = cpu_to_fs32(sb, get_seconds()); 550 + ucg->cg_time = ufs_get_seconds(sb); 551 551 for (i = newcount; i < (uspi->s_fpb - fragoff); i++) 552 552 if (ubh_isclr (UCPI_UBH(ucpi), ucpi->c_freeoff, fragno + i)) 553 553 break; ··· 639 639 if (!ufs_cg_chkmagic(sb, ucg)) 640 640 ufs_panic (sb, "ufs_alloc_fragments", 641 641 "internal error, bad magic number on cg %u", cgno); 642 - ucg->cg_time = cpu_to_fs32(sb, get_seconds()); 642 + ucg->cg_time = ufs_get_seconds(sb); 643 643 644 644 if (count == uspi->s_fpb) { 645 645 result = ufs_alloccg_block (inode, ucpi, goal, err);
+1 -1
fs/ufs/ialloc.c
··· 89 89 if (!ufs_cg_chkmagic(sb, ucg)) 90 90 ufs_panic (sb, "ufs_free_fragments", "internal error, bad cg magic number"); 91 91 92 - ucg->cg_time = cpu_to_fs32(sb, get_seconds()); 92 + ucg->cg_time = ufs_get_seconds(sb); 93 93 94 94 is_directory = S_ISDIR(inode->i_mode); 95 95
+2 -2
fs/ufs/super.c
··· 698 698 usb1 = ubh_get_usb_first(uspi); 699 699 usb3 = ubh_get_usb_third(uspi); 700 700 701 - usb1->fs_time = cpu_to_fs32(sb, get_seconds()); 701 + usb1->fs_time = ufs_get_seconds(sb); 702 702 if ((flags & UFS_ST_MASK) == UFS_ST_SUN || 703 703 (flags & UFS_ST_MASK) == UFS_ST_SUNOS || 704 704 (flags & UFS_ST_MASK) == UFS_ST_SUNx86) ··· 1342 1342 */ 1343 1343 if (*mount_flags & SB_RDONLY) { 1344 1344 ufs_put_super_internal(sb); 1345 - usb1->fs_time = cpu_to_fs32(sb, get_seconds()); 1345 + usb1->fs_time = ufs_get_seconds(sb); 1346 1346 if ((flags & UFS_ST_MASK) == UFS_ST_SUN 1347 1347 || (flags & UFS_ST_MASK) == UFS_ST_SUNOS 1348 1348 || (flags & UFS_ST_MASK) == UFS_ST_SUNx86)
+14
fs/ufs/util.h
··· 590 590 else 591 591 return *(__fs32 *)p == 0; 592 592 } 593 + 594 + static inline __fs32 ufs_get_seconds(struct super_block *sbp) 595 + { 596 + time64_t now = ktime_get_real_seconds(); 597 + 598 + /* Signed 32-bit interpretation wraps around in 2038, which 599 + * happens in ufs1 inode stamps but not ufs2 using 64-bits 600 + * stamps. For superblock and blockgroup, let's assume 601 + * unsigned 32-bit stamps, which are good until y2106. 602 + * Wrap around rather than clamp here to make the dirty 603 + * file system detection work in the superblock stamp. 604 + */ 605 + return cpu_to_fs32(sbp, lower_32_bits(now)); 606 + }