From 3eca76cc2d172737db53b1dbd0da21e45720e141 Mon Sep 17 00:00:00 2001 From: Tetsuhiro Kohada Date: Mon, 2 Mar 2020 18:57:15 +0900 Subject: [PATCH] staging: exfat: clean up d_entry rebuilding. Clean up d_entry rebuilding in exfat_rename_file() and move_file(). -Replace memcpy of d_entry with structure copy. -Change to use the value already stored in fid. Signed-off-by: Tetsuhiro Kohada Acked-by: Valdis Kletnieks Link: https://lore.kernel.org/r/20200302095716.64155-1-Kohada.Tetsuhiro@dc.MitsubishiElectric.co.jp Signed-off-by: Greg Kroah-Hartman --- drivers/staging/exfat/exfat_core.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c index ceaea1b..374a4fe 100644 --- a/drivers/staging/exfat/exfat_core.c +++ b/drivers/staging/exfat/exfat_core.c @@ -2285,12 +2285,10 @@ s32 exfat_rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry, return -ENOENT; } - memcpy((void *)epnew, (void *)epold, DENTRY_SIZE); - if (exfat_get_entry_type(epnew) == TYPE_FILE) { - exfat_set_entry_attr(epnew, - exfat_get_entry_attr(epnew) | - ATTR_ARCHIVE); + *epnew = *epold; + if (fid->type == TYPE_FILE) { fid->attr |= ATTR_ARCHIVE; + exfat_set_entry_attr(epnew, fid->attr); } exfat_buf_modify(sb, sector_new); exfat_buf_unlock(sb, sector_old); @@ -2306,7 +2304,7 @@ s32 exfat_rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry, return -ENOENT; } - memcpy((void *)epnew, (void *)epold, DENTRY_SIZE); + *epnew = *epold; exfat_buf_modify(sb, sector_new); exfat_buf_unlock(sb, sector_old); @@ -2319,11 +2317,9 @@ s32 exfat_rename_file(struct inode *inode, struct chain_t *p_dir, s32 oldentry, num_old_entries); fid->entry = newentry; } else { - if (exfat_get_entry_type(epold) == TYPE_FILE) { - exfat_set_entry_attr(epold, - exfat_get_entry_attr(epold) | - ATTR_ARCHIVE); + if (fid->type == TYPE_FILE) { fid->attr |= ATTR_ARCHIVE; + exfat_set_entry_attr(epold, fid->attr); } exfat_buf_modify(sb, sector_old); exfat_buf_unlock(sb, sector_old); @@ -2387,11 +2383,10 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry, return -ENOENT; } - memcpy((void *)epnew, (void *)epmov, DENTRY_SIZE); - if (exfat_get_entry_type(epnew) == TYPE_FILE) { - exfat_set_entry_attr(epnew, exfat_get_entry_attr(epnew) | - ATTR_ARCHIVE); + *epnew = *epmov; + if (fid->type == TYPE_FILE) { fid->attr |= ATTR_ARCHIVE; + exfat_set_entry_attr(epnew, fid->attr); } exfat_buf_modify(sb, sector_new); exfat_buf_unlock(sb, sector_mov); @@ -2406,7 +2401,7 @@ s32 move_file(struct inode *inode, struct chain_t *p_olddir, s32 oldentry, return -ENOENT; } - memcpy((void *)epnew, (void *)epmov, DENTRY_SIZE); + *epnew = *epmov; exfat_buf_modify(sb, sector_new); exfat_buf_unlock(sb, sector_mov); -- 2.7.4