exfat: replace 'time_ms' with 'time_cs'
Subsystems (2)
PATCH v4 1/1 exfat: replace 'time_ms' with 'time_cs'
Replace "time_ms" with "time_cs" in the file directory entry structure and related functions.
The unit of create_time_ms/modify_time_ms in File Directory Entry are not 'milli-second', but 'centi-second'.
The exfat specification uses the term '10ms', but instead use 'cs' as in "msdos_fs.h".
---
Changes in v4:
- change sender email
Changes in v3:
- change time_10ms to time_cs
- revert calculation formula to original
- change subject & commit-log
- rebase to 'linkinjeon/exfat.git' dev branch
Changes in v2:
- fix spelling mistakes in commit-log.
fs/exfat/dir.c | 8 ++++---- fs/exfat/exfat_fs.h | 4 ++-- fs/exfat/exfat_raw.h | 4 ++-- fs/exfat/file.c | 2 +- fs/exfat/inode.c | 4 ++-- fs/exfat/misc.c | 18 +++++++++--------- fs/exfat/namei.c | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-)
fs/exfat/dir.c +4 -4
@@ -137,12 +137,12 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry) ep->dentry.file.create_tz, ep->dentry.file.create_time, ep->dentry.file.create_date, - ep->dentry.file.create_time_ms); + ep->dentry.file.create_time_cs);exfat_get_entry_time (sbi, &dir_entry->mtime, ep->dentry.file.modify_tz, ep->dentry.file.modify_time, ep->dentry.file.modify_date, - ep->dentry.file.modify_time_ms); + ep->dentry.file.modify_time_cs); exfat_get_entry_time(sbi, &dir_entry->atime, ep->dentry.file.access_tz, ep->dentry.file.access_time,
@@ -461,12 +461,12 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir, &ep->dentry.file.create_tz, &ep->dentry.file.create_time, &ep->dentry.file.create_date, - &ep->dentry.file.create_time_ms); + &ep->dentry.file.create_time_cs);exfat_set_entry_time (sbi, &ts, &ep->dentry.file.modify_tz, &ep->dentry.file.modify_time, &ep->dentry.file.modify_date, - &ep->dentry.file.modify_time_ms); + &ep->dentry.file.modify_time_cs); exfat_set_entry_time(sbi, &ts, &ep->dentry.file.access_tz, &ep->dentry.file.access_time,
fs/exfat/exfat_fs.h +2 -2
@@ -511,10 +511,10 @@ void exfat_msg(struct super_block *sb, const char *lv, const char *fmt, ...) exfat_msg(sb, KERN_INFO, fmt, ##__VA_ARGS__)void exfat_get_entry_time (struct exfat_sb_info *sbi,struct timespec64 *ts, -u8 tz,__le16 time,__le16 date,u8 time_ms); +u8 tz,__le16 time,__le16 date,u8 time_cs);void exfat_truncate_atime (struct timespec64 *ts);void exfat_set_entry_time (struct exfat_sb_info *sbi,struct timespec64 *ts, -u8 *tz,__le16 *time,__le16 *date,u8 *time_ms); +u8 *tz,__le16 *time,__le16 *date,u8 *time_cs);unsigned short exfat_calc_chksum_2byte (void *data,int len,unsigned short chksum,int type);void exfat_update_bh (struct super_block *sb,struct buffer_head *bh,int sync);
fs/exfat/exfat_raw.h +2 -2
@@ -136,8 +136,8 @@ struct exfat_dentry {__le16 modify_date;__le16 access_time;__le16 access_date; -__u8 create_time_ms; -__u8 modify_time_ms; +__u8 create_time_cs; +__u8 modify_time_cs;__u8 create_tz;__u8 modify_tz;__u8 access_tz;
fs/exfat/file.c +1 -1
@@ -165,7 +165,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size) &ep->dentry.file.modify_tz, &ep->dentry.file.modify_time, &ep->dentry.file.modify_date, - &ep->dentry.file.modify_time_ms); + &ep->dentry.file.modify_time_cs); ep->dentry.file.attr =cpu_to_le16 (ei->attr);/* File size should be zero if there is no cluster allocated */
fs/exfat/inode.c +2 -2
@@ -56,12 +56,12 @@ static int __exfat_write_inode(struct inode *inode, int sync) &ep->dentry.file.create_tz, &ep->dentry.file.create_time, &ep->dentry.file.create_date, - &ep->dentry.file.create_time_ms); + &ep->dentry.file.create_time_cs);exfat_set_entry_time (sbi, &inode->i_mtime, &ep->dentry.file.modify_tz, &ep->dentry.file.modify_time, &ep->dentry.file.modify_date, - &ep->dentry.file.modify_time_ms); + &ep->dentry.file.modify_time_cs); exfat_set_entry_time(sbi, &inode->i_atime, &ep->dentry.file.access_tz, &ep->dentry.file.access_time,
fs/exfat/misc.c +9 -9
@@ -75,7 +75,7 @@ static void exfat_adjust_tz(struct timespec64 *ts, u8 tz_off)/* Convert a EXFAT time/date pair to a UNIX date (seconds since 1 1 70). */ void exfat_get_entry_time (struct exfat_sb_info *sbi,struct timespec64 *ts, -u8 tz,__le16 time,__le16 date,u8 time_ms) +u8 tz,__le16 time,__le16 date,u8 time_cs) {u16 t =le16_to_cpu (time);u16 d =le16_to_cpu (date);
@@ -84,10 +84,10 @@ void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts, t >> 11, (t >> 5) & 0x003F, (t & 0x001F) << 1); -/* time_ms field represent 0 ~ 199(1990 ms) */ -if (time_ms) { - ts->tv_sec += time_ms /100 ; - ts->tv_nsec = (time_ms %100 ) *10 *NSEC_PER_MSEC ; +/* time_cs field represent 0 ~ 199cs(1990 ms) */ +if (time_cs) { + ts->tv_sec += time_cs /100 ; + ts->tv_nsec = (time_cs %100 ) *10 *NSEC_PER_MSEC ; }else exfat_truncate_atime (ts);
@@ -101,7 +101,7 @@ void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,/* Convert linear UNIX date to a EXFAT time/date pair. */ void exfat_set_entry_time (struct exfat_sb_info *sbi,struct timespec64 *ts, -u8 *tz,__le16 *time,__le16 *date,u8 *time_ms) +u8 *tz,__le16 *time,__le16 *date,u8 *time_cs) {struct tm tm;u16 t, d;
@@ -113,9 +113,9 @@ void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts, *time =cpu_to_le16 (t); *date =cpu_to_le16 (d); -/* time_ms field represent 0 ~ 199(1990 ms) */ -if (time_ms) - *time_ms = (tm.tm_sec &1 ) *100 + +/* time_cs field represent 0 ~ 199cs(1990 ms) */ +if (time_cs) + *time_cs = (tm.tm_sec &1 ) *100 + ts->tv_nsec / (10 *NSEC_PER_MSEC );/*
fs/exfat/namei.c +2 -2
@@ -688,12 +688,12 @@ static int exfat_find(struct inode *dir, struct qstr *qname, ep->dentry.file.create_tz, ep->dentry.file.create_time, ep->dentry.file.create_date, - ep->dentry.file.create_time_ms); + ep->dentry.file.create_time_cs);exfat_get_entry_time (sbi, &info->mtime, ep->dentry.file.modify_tz, ep->dentry.file.modify_time, ep->dentry.file.modify_date, - ep->dentry.file.modify_time_ms); + ep->dentry.file.modify_time_cs); exfat_get_entry_time(sbi, &info->atime, ep->dentry.file.access_tz, ep->dentry.file.access_time,
Signature · 1 line
2.26.1
Namjae Jeon
AppliedQuoted 9 lines
Replace "
time_ms" with "time_cs" in the file directory entry structure and related functions.The unit of create_time_ms/modify_time_ms in File Directory Entry are not 'milli-second', but 'centi-second'.
The exfat specification uses the term '10ms', but instead use 'cs' as in "msdos_fs.h".Signed-off-by Tetsuhiro Kohada <[email protected]>
Applied.
Thanks!