mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 06:17:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: exfat: clean up d_entry rebuilding.

Browse Source 
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 <Kohada.Tetsuhiro@dc.MitsubishiElectric.co.jp>
Acked-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Link: https://lore.kernel.org/r/20200302095716.64155-1-Kohada.Tetsuhiro@dc.MitsubishiElectric.co.jp
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tetsuhiro Kohada
2020-03-02 18:57:15 +09:00
committed by Greg Kroah-Hartman
parent dbcf85e272
commit 3eca76cc2d
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/exfat/exfat_core.c
View File

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