Merge tag 'y2038-vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground (cfb82e1d) · Commits · 戴 / test

Pull y2038 vfs updates from Arnd Bergmann: "Add inode timestamp clamping. This series from Deepa Dinamani adds a per-superblock minimum/maximum timestamp limit for a file system, and clamps timestamps as they are written, to avoid random behavior from integer overflow as well as having different time stamps on disk vs in memory. At mount time, a warning is now printed for any file system that can represent current timestamps but not future timestamps more than 30 years into the future, similar to the arbitrary 30 year limit that was added to settimeofday(). This was picked as a compromise to warn users to migrate to other file systems (e.g. ext4 instead of ext3) when they need the file system to survive beyond 2038 (or similar limits in other file systems), but not get in the way of normal usage" * tag 'y2038-vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground: ext4: Reduce ext4 timestamp warnings isofs: Initialize filesystem timestamp ranges pstore: fs superblock limits fs: omfs: Initialize filesystem timestamp ranges fs: hpfs: Initialize filesystem timestamp ranges fs: ceph: Initialize filesystem timestamp ranges fs: sysv: Initialize filesystem timestamp ranges fs: affs: Initialize filesystem timestamp ranges fs: fat: Initialize filesystem timestamp ranges fs: cifs: Initialize filesystem timestamp ranges fs: nfs: Initialize filesystem timestamp ranges ext4: Initialize timestamps limits 9p: Fill min and max timestamps in sb fs: Fill in max and min timestamps in superblock utimes: Clamp the timestamps before update mount: Add mount warning for impending timestamp expiry timestamp_truncate: Replace users of timespec64_trunc vfs: Add timestamp_truncate() api vfs: Add file timestamp range support

fs/9p/vfs_super.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -69,8 +69,12 @@ v9fs_fill_super(struct super_block sb, struct v9fs_session_info v9ses,
		if (v9fs_proto_dotl(v9ses)) {
		sb->s_op = &v9fs_super_ops_dotl;
		sb->s_xattr = v9fs_xattr_handlers;
		} else
		} else {
		sb->s_op = &v9fs_super_ops;
		sb->s_time_max = U32_MAX;
		}

		sb->s_time_min = 0;

		ret = super_setup_bdi(sb);
		if (ret)

fs/affs/amigaffs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -375,7 +375,7 @@ affs_secs_to_datestamp(time64_t secs, struct affs_date *ds)
		u32 minute;
		s32 rem;

		secs -= sys_tz.tz_minuteswest * 60 + ((8 * 365 + 2) * 24 * 60 * 60);
		secs -= sys_tz.tz_minuteswest * 60 + AFFS_EPOCH_DELTA;
		if (secs < 0)
		secs = 0;
		days = div_s64_rem(secs, 86400, &rem);

fs/affs/amigaffs.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,9 @@

		#define AFFS_ROOT_BMAPS 25

		/* Seconds since Amiga epoch of 1978/01/01 to UNIX */
		#define AFFS_EPOCH_DELTA ((8 * 365 + 2) * 86400LL)

		struct affs_date {
		__be32 days;
		__be32 mins;

fs/affs/inode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -150,10 +150,10 @@ struct inode affs_iget(struct super_block sb, unsigned long ino)
		}

		inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec
		= (be32_to_cpu(tail->change.days) * (24 * 60 * 60) +
		= (be32_to_cpu(tail->change.days) * 86400LL +
		be32_to_cpu(tail->change.mins) * 60 +
		be32_to_cpu(tail->change.ticks) / 50 +
		((8 * 365 + 2) * 24 * 60 * 60)) +
		AFFS_EPOCH_DELTA) +
		sys_tz.tz_minuteswest * 60;
		inode->i_mtime.tv_nsec = inode->i_ctime.tv_nsec = inode->i_atime.tv_nsec = 0;
		affs_brelse(bh);

fs/affs/super.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -355,6 +355,10 @@ static int affs_fill_super(struct super_block sb, void data, int silent)
		sb->s_op = &affs_sops;
		sb->s_flags \|= SB_NODIRATIME;

		sb->s_time_gran = NSEC_PER_SEC;
		sb->s_time_min = sys_tz.tz_minuteswest * 60 + AFFS_EPOCH_DELTA;
		sb->s_time_max = 86400LL * U32_MAX + 86400 + sb->s_time_min;

		sbi = kzalloc(sizeof(struct affs_sb_info), GFP_KERNEL);
		if (!sbi)
		return -ENOMEM;

Admin message