Merge tag 'pci-v5.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[linux.git] / fs / fat / misc.c

diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 1e08bd54c5fbe599ba039ad668ff4cdc392b63b7..f1b2a1fc2a6a42b8f802268a8d6c071ff2d25530 100644 (file)
--- 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);
        }