Skip to content

Commit 5180138

Browse files
fs/ntfs3: Support timestamps prior to epoch
Before it used an unsigned 64-bit type, which prevented proper handling of timestamps earlier than 1970-01-01. Switch to a signed 64-bit type to support pre-epoch timestamps. The issue was caught by xfstests. Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
1 parent 3a86608 commit 5180138

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

fs/ntfs3/ntfs_fs.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -979,11 +979,12 @@ static inline __le64 kernel2nt(const struct timespec64 *ts)
979979
*/
980980
static inline void nt2kernel(const __le64 tm, struct timespec64 *ts)
981981
{
982-
u64 t = le64_to_cpu(tm) - _100ns2seconds * SecondsToStartOf1970;
982+
s32 t32;
983+
/* use signed 64 bit to support timestamps prior to epoch. xfstest 258. */
984+
s64 t = le64_to_cpu(tm) - _100ns2seconds * SecondsToStartOf1970;
983985

984-
// WARNING: do_div changes its first argument(!)
985-
ts->tv_nsec = do_div(t, _100ns2seconds) * 100;
986-
ts->tv_sec = t;
986+
ts->tv_sec = div_s64_rem(t, _100ns2seconds, &t32);
987+
ts->tv_nsec = t32 * 100;
987988
}
988989

989990
static inline struct ntfs_sb_info *ntfs_sb(struct super_block *sb)

0 commit comments

Comments
 (0)