From ed0f84d30ba65f44bed2739572c7ab0fdeed4004 Mon Sep 17 00:00:00 2001

From: Tetsuhiro Kohada <kohada.t2@gmail.com>

Date: Wed, 22 Apr 2020 08:30:56 +0900

Subject: [Backport ed0f84d30ba6] 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: Tetsuhiro Kohada <kohada.t2@gmail.com>

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>

---

 src/dir.c       |  8 ++++----

 src/exfat_fs.h  |  4 ++--

 src/exfat_raw.h |  4 ++--

 src/file.c      |  2 +-

 src/inode.c     |  4 ++--

 src/misc.c      | 18 +++++++++---------

 src/namei.c     |  4 ++--

 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/dir.c b/src/dir.c

index 53ae965da7ec583fb4e31cc548c40daf08ae941a..b5a237c33d50c02c632ec82627f78b4e70507d7a 100644

--- a/src/dir.c

+++ b/src/dir.c

@@ -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,

diff --git a/src/exfat_fs.h b/src/exfat_fs.h

index 3862df6af7386bd5e54ed338cedcee64c3cb6ddd..294aa7792bc3ca6c7e334110cba9160577d9affe 100644

--- a/src/exfat_fs.h

+++ b/src/exfat_fs.h

@@ -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);

diff --git a/src/exfat_raw.h b/src/exfat_raw.h

index 2a841010e6490ccafd5d12844a48a93fc6ee4bbf..8d6c64a7546d8bc8899e677bfd7f9d91f4e0cb4d 100644

--- a/src/exfat_raw.h

+++ b/src/exfat_raw.h

@@ -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;

diff --git a/src/file.c b/src/file.c

index c9db8eb0cfc3ee267d5e3b051974ceae8de861b5..84f3d31a3a555729b5d2e655f354929018b6b290 100644

--- a/src/file.c

+++ b/src/file.c

@@ -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 */

diff --git a/src/inode.c b/src/inode.c

index 06887492f54b791506d2f7c76eb3ef073b72026d..3f367d081cd6dfe6c7cdb475d77e130b64d14d6d 100644

--- a/src/inode.c

+++ b/src/inode.c

@@ -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,

diff --git a/src/misc.c b/src/misc.c

index ce5e8a1b0726c6778db86daebe39c437f23c7fba..ab7f88b1f6d3065cd3fca409526d50e833bbbfb0 100644

--- a/src/misc.c

+++ b/src/misc.c

@@ -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

 		ts->tv_nsec = 0;

@@ -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);

 	/*

diff --git a/src/namei.c b/src/namei.c

index fa926b9c883adf353f3e911d96d6efcd71677dcc..48f4df883f3ba5a30219f8f038a025530a8f8fa2 100644

--- a/src/namei.c

+++ b/src/namei.c

@@ -689,12 +689,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,

-- 

2.31.1