From a7a241686c8f8142afafbd5fa5b9b9b6ea1aa173 Mon Sep 17 00:00:00 2001

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

Date: Fri, 11 Sep 2020 13:45:19 +0900

Subject: [Backport a7a241686c8f] exfat: replace memcpy with structure

 assignment

Use structure assignment instead of memcpy.

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

 src/inode.c |  2 +-

 src/namei.c | 15 +++++++--------

 3 files changed, 10 insertions(+), 14 deletions(-)

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

index a9b13ae3f325fcbf628657981055b91b5079d5f6..5fa751937932f589c3f633c99ba0efd1aadad57e 100644

--- a/src/dir.c

+++ b/src/dir.c

@@ -978,11 +978,8 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,

 					if (ei->hint_femp.eidx ==

 							EXFAT_HINT_NONE ||

 						candi_empty.eidx <=

-							 ei->hint_femp.eidx) {

-						memcpy(&ei->hint_femp,

-							&candi_empty,

-							sizeof(candi_empty));

-					}

+							 ei->hint_femp.eidx)

+						ei->hint_femp = candi_empty;

 				}

 				brelse(bh);

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

index a6de17cac3dfd5566832da7cbabb5635bb186a1a..109f9b4c40d3119351695e5f84063882b41907f3 100644

--- a/src/inode.c

+++ b/src/inode.c

@@ -556,7 +556,7 @@ static int exfat_fill_inode(struct inode *inode, struct exfat_dir_entry *info)

 	struct exfat_inode_info *ei = EXFAT_I(inode);

 	loff_t size = info->size;

-	memcpy(&ei->dir, &info->dir, sizeof(struct exfat_chain));

+	ei->dir = info->dir;

 	ei->entry = info->entry;

 	ei->attr = info->attr;

 	ei->start_clu = info->start_clu;

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

index 803748946ddbf409693ba0016628cb8d0d1dcf8c..676094f2abe2d13573c7e970cbf595586f46a059 100644

--- a/src/namei.c

+++ b/src/namei.c

@@ -318,8 +318,7 @@ static int exfat_find_empty_entry(struct inode *inode,

 	hint_femp.eidx = EXFAT_HINT_NONE;

 	if (ei->hint_femp.eidx != EXFAT_HINT_NONE) {

-		memcpy(&hint_femp, &ei->hint_femp,

-				sizeof(struct exfat_hint_femp));

+		hint_femp = ei->hint_femp;

 		ei->hint_femp.eidx = EXFAT_HINT_NONE;

 	}

@@ -519,7 +518,7 @@ static int exfat_add_entry(struct inode *inode, const char *path,

 	if (ret)

 		goto out;

-	memcpy(&info->dir, p_dir, sizeof(struct exfat_chain));

+	info->dir = *p_dir;

 	info->entry = dentry;

 	info->flags = ALLOC_NO_FAT_CHAIN;

 	info->type = type;

@@ -625,7 +624,7 @@ static int exfat_find(struct inode *dir, struct qstr *qname,

 	if (dentry < 0)

 		return dentry; /* -error value */

-	memcpy(&info->dir, &cdir.dir, sizeof(struct exfat_chain));

+	info->dir = cdir;

 	info->entry = dentry;

 	info->num_subdirs = 0;

@@ -1030,7 +1029,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,

 		if (!epnew)

 			return -EIO;

-		memcpy(epnew, epold, DENTRY_SIZE);

+		*epnew = *epold;

 		if (exfat_get_entry_type(epnew) == TYPE_FILE) {

 			epnew->dentry.file.attr |= cpu_to_le16(ATTR_ARCHIVE);

 			ei->attr |= ATTR_ARCHIVE;

@@ -1050,7 +1049,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,

 			return -EIO;

 		}

-		memcpy(epnew, epold, DENTRY_SIZE);

+		*epnew = *epold;

 		exfat_update_bh(new_bh, sync);

 		brelse(old_bh);

 		brelse(new_bh);

@@ -1118,7 +1117,7 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,

 	if (!epnew)

 		return -EIO;

-	memcpy(epnew, epmov, DENTRY_SIZE);

+	*epnew = *epmov;

 	if (exfat_get_entry_type(epnew) == TYPE_FILE) {

 		epnew->dentry.file.attr |= cpu_to_le16(ATTR_ARCHIVE);

 		ei->attr |= ATTR_ARCHIVE;

@@ -1138,7 +1137,7 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,

 		return -EIO;

 	}

-	memcpy(epnew, epmov, DENTRY_SIZE);

+	*epnew = *epmov;

 	exfat_update_bh(new_bh, IS_DIRSYNC(inode));

 	brelse(mov_bh);

 	brelse(new_bh);

-- 

2.31.1