Commit 97acf83d authored Dec 02, 2019 by Deepa Dinamani Committed by Al Viro Dec 08, 2019

fs: fat: Eliminate timespec64_trunc() usage



timespec64_trunc() is being deleted.

timestamp_truncate() is the replacement api for
timespec64_trunc. timestamp_truncate() additionally clamps
timestamps to make sure the timestamps lie within the
permitted range for the filesystem.

But, fat always truncates the times locally after it obtains
the timestamps from current_time().
Implement a local version here along the lines of existing
truncate functions.

Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: hirofumi@mail.parknet.co.jp
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

parent eb31e2f6

fs/fat/misc.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -271,6 +271,14 @@ static inline struct timespec64 fat_timespec64_trunc_2secs(struct timespec64 ts)
		{
		return (struct timespec64){ ts.tv_sec & ~1ULL, 0 };
		}

		static inline struct timespec64 fat_timespec64_trunc_10ms(struct timespec64 ts)
		{
		if (ts.tv_nsec)
		ts.tv_nsec -= ts.tv_nsec % 10000000UL;
		return ts;
		}

		/*
		* truncate the various times with appropriate granularity:
		* root inode:
		@@ -308,7 +316,7 @@ int fat_truncate_time(struct inode inode, struct timespec64 now, int flags)
		}
		if (flags & S_CTIME) {
		if (sbi->options.isvfat)
		inode->i_ctime = timespec64_trunc(*now, 10000000);
		inode->i_ctime = fat_timespec64_trunc_10ms(*now);
		else
		inode->i_ctime = fat_timespec64_trunc_2secs(*now);
		}

Admin message