From 04cee52fb8bdbdb0506460f191ed6fd9e6faf00b Mon Sep 17 00:00:00 2001

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

Date: Thu, 17 Sep 2020 10:39:16 +0900

Subject: [Backport 04cee52fb8bd] exfat: remove 'rwoffset' in exfat_inode_info

Remove 'rwoffset' in exfat_inode_info and replace it with the parameter of

exfat_readdir().

Since rwoffset is referenced only by exfat_readdir(), it is not necessary

a exfat_inode_info's member.

Also, change cpos to point to the next of entry-set, and return the index

of dir-entry via dir_entry->entry.

Signed-off-by: Tetsuhiro Kohada <kohada.t2@gmail.com>

Acked-by: Sungjong Seo <sj1557.seo@samsung.com>

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

---

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

 src/exfat_fs.h |  2 --

 src/file.c     |  2 --

 src/inode.c    |  3 ---

 src/super.c    |  1 -

 5 files changed, 9 insertions(+), 20 deletions(-)

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

index 5fa751937932f589c3f633c99ba0efd1aadad57e..916797077aad4ab45cd73c36a5012fd2653fef33 100644

--- a/src/dir.c

+++ b/src/dir.c

@@ -59,9 +59,9 @@ static void exfat_get_uniname_from_ext_entry(struct super_block *sb,

 }

 /* read a directory entry from the opened directory */

-static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)

+static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_entry *dir_entry)

 {

-	int i, dentries_per_clu, dentries_per_clu_bits = 0;

+	int i, dentries_per_clu, dentries_per_clu_bits = 0, num_ext;

 	unsigned int type, clu_offset;

 	sector_t sector;

 	struct exfat_chain dir, clu;

@@ -70,7 +70,7 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)

 	struct super_block *sb = inode->i_sb;

 	struct exfat_sb_info *sbi = EXFAT_SB(sb);

 	struct exfat_inode_info *ei = EXFAT_I(inode);

-	unsigned int dentry = ei->rwoffset & 0xFFFFFFFF;

+	unsigned int dentry = EXFAT_B_TO_DEN(*cpos) & 0xFFFFFFFF;

 	struct buffer_head *bh;

 	/* check if the given file ID is opened */

@@ -127,6 +127,7 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)

 				continue;

 			}

+			num_ext = ep->dentry.file.num_ext;

 			dir_entry->attr = le16_to_cpu(ep->dentry.file.attr);

 			exfat_get_entry_time(sbi, &dir_entry->crtime,

 					ep->dentry.file.create_tz,

@@ -157,12 +158,13 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)

 				return -EIO;

 			dir_entry->size =

 				le64_to_cpu(ep->dentry.stream.valid_size);

+			dir_entry->entry = dentry;

 			brelse(bh);

 			ei->hint_bmap.off = dentry >> dentries_per_clu_bits;

 			ei->hint_bmap.clu = clu.dir;

-			ei->rwoffset = ++dentry;

+			*cpos = EXFAT_DEN_TO_B(dentry + 1 + num_ext);

 			return 0;

 		}

@@ -178,7 +180,7 @@ static int exfat_readdir(struct inode *inode, struct exfat_dir_entry *dir_entry)

 	}

 	dir_entry->namebuf.lfn[0] = '\0';

-	ei->rwoffset = dentry;

+	*cpos = EXFAT_DEN_TO_B(dentry);

 	return 0;

 }

@@ -242,12 +244,10 @@ static int exfat_iterate(struct file *filp, struct dir_context *ctx)

 	if (err)

 		goto unlock;

 get_new:

-	ei->rwoffset = EXFAT_B_TO_DEN(cpos);

-

 	if (cpos >= i_size_read(inode))

 		goto end_of_dir;

-	err = exfat_readdir(inode, &de);

+	err = exfat_readdir(inode, &cpos, &de);

 	if (err) {

 		/*

 		 * At least we tried to read a sector.  Move cpos to next sector

@@ -262,13 +262,10 @@ static int exfat_iterate(struct file *filp, struct dir_context *ctx)

 		goto end_of_dir;

 	}

-	cpos = EXFAT_DEN_TO_B(ei->rwoffset);

-

 	if (!nb->lfn[0])

 		goto end_of_dir;

-	i_pos = ((loff_t)ei->start_clu << 32) |

-		((ei->rwoffset - 1) & 0xffffffff);

+	i_pos = ((loff_t)ei->start_clu << 32) |	(de.entry & 0xffffffff);

 	tmp = exfat_iget(sb, i_pos);

 	if (tmp) {

 		inum = tmp->i_ino;

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

index 49af03660d6c31423864e866db70c34df943c691..b8f0e829ecbd26c14788899de066e533b6dbaf1e 100644

--- a/src/exfat_fs.h

+++ b/src/exfat_fs.h

@@ -265,8 +265,6 @@ struct exfat_inode_info {

 	 * the validation of hint_stat.

 	 */

 	unsigned int version;

-	/* file offset or dentry index for readdir */

-	loff_t rwoffset;

 	/* hint for cluster last accessed */

 	struct exfat_hint hint_bmap;

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

index 4831a39632a18d65ef4901d355f2dc58700b8e45..a92478eabfa4e43f2198ccf9b62b8632b697c8dc 100644

--- a/src/file.c

+++ b/src/file.c

@@ -208,8 +208,6 @@ int __exfat_truncate(struct inode *inode, loff_t new_size)

 	/* hint information */

 	ei->hint_bmap.off = EXFAT_EOF_CLUSTER;

 	ei->hint_bmap.clu = EXFAT_EOF_CLUSTER;

-	if (ei->rwoffset > new_size)

-		ei->rwoffset = new_size;

 	/* hint_stat will be used if this is directory. */

 	ei->hint_stat.eidx = 0;

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

index 109f9b4c40d3119351695e5f84063882b41907f3..730373e0965aff2a8c366b34482c61afeec9cd56 100644

--- a/src/inode.c

+++ b/src/inode.c

@@ -114,8 +114,6 @@ static int exfat_map_cluster(struct inode *inode, unsigned int clu_offset,

 	unsigned int local_clu_offset = clu_offset;

 	unsigned int num_to_be_allocated = 0, num_clusters = 0;

-	ei->rwoffset = EXFAT_CLU_TO_B(clu_offset, sbi);

-

 	if (EXFAT_I(inode)->i_size_ondisk > 0)

 		num_clusters =

 			EXFAT_B_TO_CLU_ROUND_UP(EXFAT_I(inode)->i_size_ondisk,

@@ -567,7 +565,6 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info)

 	ei->hint_stat.eidx = 0;

 	ei->hint_stat.clu = info->start_clu;

 	ei->hint_femp.eidx = EXFAT_HINT_NONE;

-	ei->rwoffset = 0;

 	ei->hint_bmap.off = EXFAT_EOF_CLUSTER;

 	ei->i_pos = 0;

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

index 60b941ba557b41fae3ea6b16b3041c3aecdc2b93..3ffdce5c7384dd4ad416068d78675a40d0d01e64 100644

--- a/src/super.c

+++ b/src/super.c

@@ -342,7 +342,6 @@ static int exfat_read_root(struct inode *inode)

 	ei->flags = ALLOC_FAT_CHAIN;

 	ei->type = TYPE_DIR;

 	ei->version = 0;

-	ei->rwoffset = 0;

 	ei->hint_bmap.off = EXFAT_EOF_CLUSTER;

 	ei->hint_stat.eidx = 0;

 	ei->hint_stat.clu = sbi->root_dir;

-- 

2.31.1