UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Deepa Dinamani 2019-12-02 21:19:40 -08:00 committed by Al Viro
parent eb31e2f63d
commit 97acf83de4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/fat/misc.c
View File

@ -271,6 +271,14 @@ static inline struct timespec64 fat_timespec64_trunc_2secs(struct timespec64 ts)
{ {
return (struct timespec64){ ts.tv_sec & ~1ULL, 0 }; 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: * truncate the various times with appropriate granularity:
* root inode: * root inode:
@ -308,7 +316,7 @@ int fat_truncate_time(struct inode *inode, struct timespec64 *now, int flags)
} }
if (flags & S_CTIME) { if (flags & S_CTIME) {
if (sbi->options.isvfat) if (sbi->options.isvfat)
inode->i_ctime = timespec64_trunc(*now, 10000000); inode->i_ctime = fat_timespec64_trunc_10ms(*now);
else else
inode->i_ctime = fat_timespec64_trunc_2secs(*now); inode->i_ctime = fat_timespec64_trunc_2secs(*now);
} }