Commit ed0f84d3 authored by Tetsuhiro Kohada's avatar Tetsuhiro Kohada Committed by Namjae Jeon

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.
Signed-off-by: default avatarTetsuhiro Kohada <kohada.t2@gmail.com>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
parent cdc06129
...@@ -137,12 +137,12 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry) ...@@ -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_tz,
ep->dentry.file.create_time, ep->dentry.file.create_time,
ep->dentry.file.create_date, 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, exfat_get_entry_time(sbi, &dir_entry->mtime,
ep->dentry.file.modify_tz, ep->dentry.file.modify_tz,
ep->dentry.file.modify_time, ep->dentry.file.modify_time,
ep->dentry.file.modify_date, 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, exfat_get_entry_time(sbi, &dir_entry->atime,
ep->dentry.file.access_tz, ep->dentry.file.access_tz,
ep->dentry.file.access_time, ep->dentry.file.access_time,
...@@ -461,12 +461,12 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir, ...@@ -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_tz,
&ep->dentry.file.create_time, &ep->dentry.file.create_time,
&ep->dentry.file.create_date, &ep->dentry.file.create_date,
&ep->dentry.file.create_time_ms); &ep->dentry.file.create_time_cs);
exfat_set_entry_time(sbi, &ts, exfat_set_entry_time(sbi, &ts,
&ep->dentry.file.modify_tz, &ep->dentry.file.modify_tz,
&ep->dentry.file.modify_time, &ep->dentry.file.modify_time,
&ep->dentry.file.modify_date, &ep->dentry.file.modify_date,
&ep->dentry.file.modify_time_ms); &ep->dentry.file.modify_time_cs);
exfat_set_entry_time(sbi, &ts, exfat_set_entry_time(sbi, &ts,
&ep->dentry.file.access_tz, &ep->dentry.file.access_tz,
&ep->dentry.file.access_time, &ep->dentry.file.access_time,
......
...@@ -511,10 +511,10 @@ void exfat_msg(struct super_block *sb, const char *lv, const char *fmt, ...) ...@@ -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__) exfat_msg(sb, KERN_INFO, fmt, ##__VA_ARGS__)
void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts, 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_truncate_atime(struct timespec64 *ts);
void exfat_set_entry_time(struct exfat_sb_info *sbi, 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 exfat_calc_chksum_2byte(void *data, int len,
unsigned short chksum, int type); unsigned short chksum, int type);
void exfat_update_bh(struct super_block *sb, struct buffer_head *bh, int sync); void exfat_update_bh(struct super_block *sb, struct buffer_head *bh, int sync);
......
...@@ -136,8 +136,8 @@ struct exfat_dentry { ...@@ -136,8 +136,8 @@ struct exfat_dentry {
__le16 modify_date; __le16 modify_date;
__le16 access_time; __le16 access_time;
__le16 access_date; __le16 access_date;
__u8 create_time_ms; __u8 create_time_cs;
__u8 modify_time_ms; __u8 modify_time_cs;
__u8 create_tz; __u8 create_tz;
__u8 modify_tz; __u8 modify_tz;
__u8 access_tz; __u8 access_tz;
......
...@@ -165,7 +165,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size) ...@@ -165,7 +165,7 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)
&ep->dentry.file.modify_tz, &ep->dentry.file.modify_tz,
&ep->dentry.file.modify_time, &ep->dentry.file.modify_time,
&ep->dentry.file.modify_date, &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); ep->dentry.file.attr = cpu_to_le16(ei->attr);
/* File size should be zero if there is no cluster allocated */ /* File size should be zero if there is no cluster allocated */
......
...@@ -56,12 +56,12 @@ static int __exfat_write_inode(struct inode *inode, int sync) ...@@ -56,12 +56,12 @@ static int __exfat_write_inode(struct inode *inode, int sync)
&ep->dentry.file.create_tz, &ep->dentry.file.create_tz,
&ep->dentry.file.create_time, &ep->dentry.file.create_time,
&ep->dentry.file.create_date, &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, exfat_set_entry_time(sbi, &inode->i_mtime,
&ep->dentry.file.modify_tz, &ep->dentry.file.modify_tz,
&ep->dentry.file.modify_time, &ep->dentry.file.modify_time,
&ep->dentry.file.modify_date, &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, exfat_set_entry_time(sbi, &inode->i_atime,
&ep->dentry.file.access_tz, &ep->dentry.file.access_tz,
&ep->dentry.file.access_time, &ep->dentry.file.access_time,
......
...@@ -75,7 +75,7 @@ static void exfat_adjust_tz(struct timespec64 *ts, u8 tz_off) ...@@ -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). */ /* 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, 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 t = le16_to_cpu(time);
u16 d = le16_to_cpu(date); u16 d = le16_to_cpu(date);
...@@ -84,10 +84,10 @@ void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts, ...@@ -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); t >> 11, (t >> 5) & 0x003F, (t & 0x001F) << 1);
/* time_ms field represent 0 ~ 199(1990 ms) */ /* time_cs field represent 0 ~ 199cs(1990 ms) */
if (time_ms) { if (time_cs) {
ts->tv_sec += time_ms / 100; ts->tv_sec += time_cs / 100;
ts->tv_nsec = (time_ms % 100) * 10 * NSEC_PER_MSEC; ts->tv_nsec = (time_cs % 100) * 10 * NSEC_PER_MSEC;
} else } else
ts->tv_nsec = 0; ts->tv_nsec = 0;
...@@ -101,7 +101,7 @@ void exfat_get_entry_time(struct exfat_sb_info *sbi, struct timespec64 *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. */ /* Convert linear UNIX date to a EXFAT time/date pair. */
void exfat_set_entry_time(struct exfat_sb_info *sbi, 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)
{ {
struct tm tm; struct tm tm;
u16 t, d; u16 t, d;
...@@ -113,9 +113,9 @@ void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts, ...@@ -113,9 +113,9 @@ void exfat_set_entry_time(struct exfat_sb_info *sbi, struct timespec64 *ts,
*time = cpu_to_le16(t); *time = cpu_to_le16(t);
*date = cpu_to_le16(d); *date = cpu_to_le16(d);
/* time_ms field represent 0 ~ 199(1990 ms) */ /* time_cs field represent 0 ~ 199cs(1990 ms) */
if (time_ms) if (time_cs)
*time_ms = (tm.tm_sec & 1) * 100 + *time_cs = (tm.tm_sec & 1) * 100 +
ts->tv_nsec / (10 * NSEC_PER_MSEC); ts->tv_nsec / (10 * NSEC_PER_MSEC);
/* /*
......
...@@ -689,12 +689,12 @@ static int exfat_find(struct inode *dir, struct qstr *qname, ...@@ -689,12 +689,12 @@ static int exfat_find(struct inode *dir, struct qstr *qname,
ep->dentry.file.create_tz, ep->dentry.file.create_tz,
ep->dentry.file.create_time, ep->dentry.file.create_time,
ep->dentry.file.create_date, ep->dentry.file.create_date,
ep->dentry.file.create_time_ms); ep->dentry.file.create_time_cs);
exfat_get_entry_time(sbi, &info->mtime, exfat_get_entry_time(sbi, &info->mtime,
ep->dentry.file.modify_tz, ep->dentry.file.modify_tz,
ep->dentry.file.modify_time, ep->dentry.file.modify_time,
ep->dentry.file.modify_date, ep->dentry.file.modify_date,
ep->dentry.file.modify_time_ms); ep->dentry.file.modify_time_cs);
exfat_get_entry_time(sbi, &info->atime, exfat_get_entry_time(sbi, &info->atime,
ep->dentry.file.access_tz, ep->dentry.file.access_tz,
ep->dentry.file.access_time, ep->dentry.file.access_time,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment