On Mon, Jul 29, 2019 at 06:49:10PM -0700, Deepa Dinamani wrote: > Fill in the appropriate limits to avoid inconsistencies > in the vfs cached inode times when timestamps are > outside the permitted range. > > Even though some filesystems are read-only, fill in the > timestamps to reflect the on-disk representation. > > Signed-off-by: Deepa Dinamani <deepa.ker...@gmail.com> > Cc: aivazian.tig...@gmail.com > Cc: a...@alarsen.net > Cc: c...@cs.cmu.edu > Cc: darrick.w...@oracle.com > Cc: dushis...@mail.ru > Cc: dw...@infradead.org > Cc: h...@infradead.org > Cc: j...@suse.com > Cc: jahar...@cs.cmu.edu > Cc: lui...@kernel.org > Cc: n...@fluxnic.net > Cc: phil...@squashfs.org.uk > Cc: rich...@nod.at > Cc: salah.tr...@gmail.com > Cc: sha...@kernel.org > Cc: linux-...@vger.kernel.org > Cc: codal...@coda.cs.cmu.edu > Cc: linux-e...@vger.kernel.org > Cc: linux-...@lists.infradead.org > Cc: jfs-discuss...@lists.sourceforge.net > Cc: reiserfs-de...@vger.kernel.org > --- > fs/befs/linuxvfs.c | 2 ++ > fs/bfs/inode.c | 2 ++ > fs/coda/inode.c | 3 +++ > fs/cramfs/inode.c | 2 ++ > fs/efs/super.c | 2 ++ > fs/ext2/super.c | 2 ++ > fs/freevxfs/vxfs_super.c | 2 ++ > fs/jffs2/fs.c | 3 +++ > fs/jfs/super.c | 2 ++ > fs/minix/inode.c | 2 ++ > fs/qnx4/inode.c | 2 ++ > fs/qnx6/inode.c | 2 ++ > fs/reiserfs/super.c | 3 +++ > fs/romfs/super.c | 2 ++ > fs/squashfs/super.c | 2 ++ > fs/ufs/super.c | 7 +++++++ > fs/xfs/xfs_super.c | 2 ++ > 17 files changed, 42 insertions(+) > > diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c > index 462d096ff3e9..64cdf4d8e424 100644 > --- a/fs/befs/linuxvfs.c > +++ b/fs/befs/linuxvfs.c > @@ -893,6 +893,8 @@ befs_fill_super(struct super_block *sb, void *data, int > silent) > sb_set_blocksize(sb, (ulong) befs_sb->block_size); > sb->s_op = &befs_sops; > sb->s_export_op = &befs_export_operations; > + sb->s_time_min = 0; > + sb->s_time_max = 0xffffffffffffll; > root = befs_iget(sb, iaddr2blockno(sb, &(befs_sb->root_dir))); > if (IS_ERR(root)) { > ret = PTR_ERR(root); > diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c > index 5e97bed073d7..f8ce1368218b 100644 > --- a/fs/bfs/inode.c > +++ b/fs/bfs/inode.c > @@ -324,6 +324,8 @@ static int bfs_fill_super(struct super_block *s, void > *data, int silent) > return -ENOMEM; > mutex_init(&info->bfs_lock); > s->s_fs_info = info; > + s->s_time_min = 0; > + s->s_time_max = U32_MAX; > > sb_set_blocksize(s, BFS_BSIZE); > > diff --git a/fs/coda/inode.c b/fs/coda/inode.c > index 321f56e487cb..b1c70e2b9b1e 100644 > --- a/fs/coda/inode.c > +++ b/fs/coda/inode.c > @@ -188,6 +188,9 @@ static int coda_fill_super(struct super_block *sb, void > *data, int silent) > sb->s_magic = CODA_SUPER_MAGIC; > sb->s_op = &coda_super_operations; > sb->s_d_op = &coda_dentry_operations; > + sb->s_time_gran = 1; > + sb->s_time_min = S64_MIN; > + sb->s_time_max = S64_MAX; > > error = super_setup_bdi(sb); > if (error) > diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c > index 9352487bd0fc..4d1d8b7761ed 100644 > --- a/fs/cramfs/inode.c > +++ b/fs/cramfs/inode.c > @@ -597,6 +597,8 @@ static int cramfs_finalize_super(struct super_block *sb, > > /* Set it all up.. */ > sb->s_flags |= SB_RDONLY; > + sb->s_time_min = 0; > + sb->s_time_max = 0; > sb->s_op = &cramfs_ops; > root = get_cramfs_inode(sb, cramfs_root, 0); > if (IS_ERR(root)) > diff --git a/fs/efs/super.c b/fs/efs/super.c > index 867fc24dee20..4a6ebff2af76 100644 > --- a/fs/efs/super.c > +++ b/fs/efs/super.c > @@ -257,6 +257,8 @@ static int efs_fill_super(struct super_block *s, void *d, > int silent) > if (!sb) > return -ENOMEM; > s->s_fs_info = sb; > + s->s_time_min = 0; > + s->s_time_max = U32_MAX; > > s->s_magic = EFS_SUPER_MAGIC; > if (!sb_set_blocksize(s, EFS_BLOCKSIZE)) { > diff --git a/fs/ext2/super.c b/fs/ext2/super.c > index 44eb6e7eb492..baa36c6fb71e 100644 > --- a/fs/ext2/super.c > +++ b/fs/ext2/super.c > @@ -1002,6 +1002,8 @@ static int ext2_fill_super(struct super_block *sb, void > *data, int silent) > > sb->s_maxbytes = ext2_max_size(sb->s_blocksize_bits); > sb->s_max_links = EXT2_LINK_MAX; > + sb->s_time_min = S32_MIN; > + sb->s_time_max = S32_MAX; > > if (le32_to_cpu(es->s_rev_level) == EXT2_GOOD_OLD_REV) { > sbi->s_inode_size = EXT2_GOOD_OLD_INODE_SIZE; > diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c > index a89f68c3cbed..578a5062706e 100644 > --- a/fs/freevxfs/vxfs_super.c > +++ b/fs/freevxfs/vxfs_super.c > @@ -229,6 +229,8 @@ static int vxfs_fill_super(struct super_block *sbp, void > *dp, int silent) > > sbp->s_op = &vxfs_super_ops; > sbp->s_fs_info = infp; > + sbp->s_time_min = 0; > + sbp->s_time_max = U32_MAX; > > if (!vxfs_try_sb_magic(sbp, silent, 1, > (__force __fs32)cpu_to_le32(VXFS_SUPER_MAGIC))) { > diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c > index 8a20ddd25f2d..d0b59d03a7a9 100644 > --- a/fs/jffs2/fs.c > +++ b/fs/jffs2/fs.c > @@ -590,6 +590,9 @@ int jffs2_do_fill_super(struct super_block *sb, void > *data, int silent) > sb->s_blocksize = PAGE_SIZE; > sb->s_blocksize_bits = PAGE_SHIFT; > sb->s_magic = JFFS2_SUPER_MAGIC; > + sb->s_time_min = 0; > + sb->s_time_max = U32_MAX; > + > if (!sb_rdonly(sb)) > jffs2_start_garbage_collect_thread(c); > return 0; > diff --git a/fs/jfs/super.c b/fs/jfs/super.c > index f4e10cb9f734..b2dc4d1f9dcc 100644 > --- a/fs/jfs/super.c > +++ b/fs/jfs/super.c > @@ -503,6 +503,8 @@ static int jfs_fill_super(struct super_block *sb, void > *data, int silent) > > sb->s_fs_info = sbi; > sb->s_max_links = JFS_LINK_MAX; > + sb->s_time_min = 0; > + sb->s_time_max = U32_MAX; > sbi->sb = sb; > sbi->uid = INVALID_UID; > sbi->gid = INVALID_GID; > diff --git a/fs/minix/inode.c b/fs/minix/inode.c > index f96073f25432..7cb5fd38eb14 100644 > --- a/fs/minix/inode.c > +++ b/fs/minix/inode.c > @@ -277,6 +277,8 @@ static int minix_fill_super(struct super_block *s, void > *data, int silent) > > /* set up enough so that it can read an inode */ > s->s_op = &minix_sops; > + s->s_time_min = 0; > + s->s_time_max = U32_MAX; > root_inode = minix_iget(s, MINIX_ROOT_INO); > if (IS_ERR(root_inode)) { > ret = PTR_ERR(root_inode); > diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c > index 922d083bbc7c..e8da1cde87b9 100644 > --- a/fs/qnx4/inode.c > +++ b/fs/qnx4/inode.c > @@ -201,6 +201,8 @@ static int qnx4_fill_super(struct super_block *s, void > *data, int silent) > s->s_op = &qnx4_sops; > s->s_magic = QNX4_SUPER_MAGIC; > s->s_flags |= SB_RDONLY; /* Yup, read-only yet */ > + s->s_time_min = 0; > + s->s_time_max = U32_MAX; > > /* Check the superblock signature. Since the qnx4 code is > dangerous, we should leave as quickly as possible > diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c > index 0f8b0ff1ba43..345db56c98fd 100644 > --- a/fs/qnx6/inode.c > +++ b/fs/qnx6/inode.c > @@ -429,6 +429,8 @@ static int qnx6_fill_super(struct super_block *s, void > *data, int silent) > s->s_op = &qnx6_sops; > s->s_magic = QNX6_SUPER_MAGIC; > s->s_flags |= SB_RDONLY; /* Yup, read-only yet */ > + s->s_time_min = 0; > + s->s_time_max = U32_MAX; > > /* ease the later tree level calculations */ > sbi = QNX6_SB(s); > diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c > index ab028ea0e561..d69b4ac0ae2f 100644 > --- a/fs/reiserfs/super.c > +++ b/fs/reiserfs/super.c > @@ -1976,6 +1976,9 @@ static int reiserfs_fill_super(struct super_block *s, > void *data, int silent) > goto error_unlocked; > } > > + s->s_time_min = 0; > + s->s_time_max = U32_MAX; > + > rs = SB_DISK_SUPER_BLOCK(s); > /* > * Let's do basic sanity check to verify that underlying device is not > diff --git a/fs/romfs/super.c b/fs/romfs/super.c > index 7d580f7c3f1d..a42c0e3079dc 100644 > --- a/fs/romfs/super.c > +++ b/fs/romfs/super.c > @@ -478,6 +478,8 @@ static int romfs_fill_super(struct super_block *sb, void > *data, int silent) > sb->s_maxbytes = 0xFFFFFFFF; > sb->s_magic = ROMFS_MAGIC; > sb->s_flags |= SB_RDONLY | SB_NOATIME; > + sb->s_time_min = 0; > + sb->s_time_max = 0; > sb->s_op = &romfs_super_ops; > > #ifdef CONFIG_ROMFS_ON_MTD > diff --git a/fs/squashfs/super.c b/fs/squashfs/super.c > index effa638d6d85..a9e9837617a9 100644 > --- a/fs/squashfs/super.c > +++ b/fs/squashfs/super.c > @@ -183,6 +183,8 @@ static int squashfs_fill_super(struct super_block *sb, > void *data, int silent) > (u64) le64_to_cpu(sblk->id_table_start)); > > sb->s_maxbytes = MAX_LFS_FILESIZE; > + sb->s_time_min = 0; > + sb->s_time_max = U32_MAX; > sb->s_flags |= SB_RDONLY; > sb->s_op = &squashfs_super_ops; > > diff --git a/fs/ufs/super.c b/fs/ufs/super.c > index 4ed0dca52ec8..1da0be667409 100644 > --- a/fs/ufs/super.c > +++ b/fs/ufs/super.c > @@ -843,6 +843,10 @@ static int ufs_fill_super(struct super_block *sb, void > *data, int silent) > > sb->s_maxbytes = MAX_LFS_FILESIZE; > > + sb->s_time_gran = NSEC_PER_SEC; > + sb->s_time_min = S32_MIN; > + sb->s_time_max = S32_MAX; > + > switch (sbi->s_mount_opt & UFS_MOUNT_UFSTYPE) { > case UFS_MOUNT_UFSTYPE_44BSD: > UFSD("ufstype=44bsd\n"); > @@ -861,6 +865,9 @@ static int ufs_fill_super(struct super_block *sb, void > *data, int silent) > uspi->s_fshift = 9; > uspi->s_sbsize = super_block_size = 1536; > uspi->s_sbbase = 0; > + sb->s_time_gran = 1; > + sb->s_time_min = S64_MIN; > + sb->s_time_max = S64_MAX; > flags |= UFS_TYPE_UFS2 | UFS_DE_44BSD | UFS_UID_44BSD | > UFS_ST_44BSD | UFS_CG_44BSD; > break; > > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index a14d11d78bd8..1a0daf46bae8 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c > @@ -1685,6 +1685,8 @@ xfs_fs_fill_super( > sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits); > sb->s_max_links = XFS_MAXLINK; > sb->s_time_gran = 1; > + sb->s_time_min = S32_MIN; > + sb->s_time_max = S32_MAX;
For the XFS part, Reviewed-by: Darrick J. Wong <darrick.w...@oracle.com> --D > set_posix_acl_flag(sb); > > /* version 5 superblocks support inode version counters. */ > -- > 2.17.1 > _______________________________________________ Y2038 mailing list Y2038@lists.linaro.org https://lists.linaro.org/mailman/listinfo/y2038