diff options
| author |   Deepa Dinamani <deepa.kernel@gmail.com> | 2019-12-02 21:19:40 -0800 |
|---|---|---|
| committer |   Al Viro <viro@zeniv.linux.org.uk> | 2019-12-08 19:10:51 -0500 |
| commit | 97acf83de493ece462b7edccf920f0dbfb857f2b (patch) | |
| tree | e27eb545f786d1127d0df7a400a717171182b7b2 /fs/fat | |
| parent | utimes: Clamp the timestamps in notify_change() (diff) | |
| download | wireguard-linux-97acf83de493ece462b7edccf920f0dbfb857f2b.tar.xz wireguard-linux-97acf83de493ece462b7edccf920f0dbfb857f2b.zip | |
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>
Diffstat (limited to 'fs/fat')
| -rw-r--r-- | fs/fat/misc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/fat/misc.c b/fs/fat/misc.c index 1e08bd54c5fb..f1b2a1fc2a6a 100644 --- a/fs/fat/misc.c +++ b/fs/fat/misc.c @@ -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); } |