mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-24 01:09:38 -05:00
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>
This commit is contained in:
parent
6c958a0955
commit
a7a241686c
3 changed files with 10 additions and 14 deletions
|
@ -978,11 +978,8 @@ rewind:
|
||||||
if (ei->hint_femp.eidx ==
|
if (ei->hint_femp.eidx ==
|
||||||
EXFAT_HINT_NONE ||
|
EXFAT_HINT_NONE ||
|
||||||
candi_empty.eidx <=
|
candi_empty.eidx <=
|
||||||
ei->hint_femp.eidx) {
|
ei->hint_femp.eidx)
|
||||||
memcpy(&ei->hint_femp,
|
ei->hint_femp = candi_empty;
|
||||||
&candi_empty,
|
|
||||||
sizeof(candi_empty));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
brelse(bh);
|
brelse(bh);
|
||||||
|
|
|
@ -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);
|
struct exfat_inode_info *ei = EXFAT_I(inode);
|
||||||
loff_t size = info->size;
|
loff_t size = info->size;
|
||||||
|
|
||||||
memcpy(&ei->dir, &info->dir, sizeof(struct exfat_chain));
|
ei->dir = info->dir;
|
||||||
ei->entry = info->entry;
|
ei->entry = info->entry;
|
||||||
ei->attr = info->attr;
|
ei->attr = info->attr;
|
||||||
ei->start_clu = info->start_clu;
|
ei->start_clu = info->start_clu;
|
||||||
|
|
|
@ -318,8 +318,7 @@ static int exfat_find_empty_entry(struct inode *inode,
|
||||||
hint_femp.eidx = EXFAT_HINT_NONE;
|
hint_femp.eidx = EXFAT_HINT_NONE;
|
||||||
|
|
||||||
if (ei->hint_femp.eidx != EXFAT_HINT_NONE) {
|
if (ei->hint_femp.eidx != EXFAT_HINT_NONE) {
|
||||||
memcpy(&hint_femp, &ei->hint_femp,
|
hint_femp = ei->hint_femp;
|
||||||
sizeof(struct exfat_hint_femp));
|
|
||||||
ei->hint_femp.eidx = EXFAT_HINT_NONE;
|
ei->hint_femp.eidx = EXFAT_HINT_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -519,7 +518,7 @@ static int exfat_add_entry(struct inode *inode, const char *path,
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
memcpy(&info->dir, p_dir, sizeof(struct exfat_chain));
|
info->dir = *p_dir;
|
||||||
info->entry = dentry;
|
info->entry = dentry;
|
||||||
info->flags = ALLOC_NO_FAT_CHAIN;
|
info->flags = ALLOC_NO_FAT_CHAIN;
|
||||||
info->type = type;
|
info->type = type;
|
||||||
|
@ -625,7 +624,7 @@ static int exfat_find(struct inode *dir, struct qstr *qname,
|
||||||
if (dentry < 0)
|
if (dentry < 0)
|
||||||
return dentry; /* -error value */
|
return dentry; /* -error value */
|
||||||
|
|
||||||
memcpy(&info->dir, &cdir.dir, sizeof(struct exfat_chain));
|
info->dir = cdir;
|
||||||
info->entry = dentry;
|
info->entry = dentry;
|
||||||
info->num_subdirs = 0;
|
info->num_subdirs = 0;
|
||||||
|
|
||||||
|
@ -1030,7 +1029,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
|
||||||
if (!epnew)
|
if (!epnew)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
memcpy(epnew, epold, DENTRY_SIZE);
|
*epnew = *epold;
|
||||||
if (exfat_get_entry_type(epnew) == TYPE_FILE) {
|
if (exfat_get_entry_type(epnew) == TYPE_FILE) {
|
||||||
epnew->dentry.file.attr |= cpu_to_le16(ATTR_ARCHIVE);
|
epnew->dentry.file.attr |= cpu_to_le16(ATTR_ARCHIVE);
|
||||||
ei->attr |= 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;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(epnew, epold, DENTRY_SIZE);
|
*epnew = *epold;
|
||||||
exfat_update_bh(new_bh, sync);
|
exfat_update_bh(new_bh, sync);
|
||||||
brelse(old_bh);
|
brelse(old_bh);
|
||||||
brelse(new_bh);
|
brelse(new_bh);
|
||||||
|
@ -1118,7 +1117,7 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
|
||||||
if (!epnew)
|
if (!epnew)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
memcpy(epnew, epmov, DENTRY_SIZE);
|
*epnew = *epmov;
|
||||||
if (exfat_get_entry_type(epnew) == TYPE_FILE) {
|
if (exfat_get_entry_type(epnew) == TYPE_FILE) {
|
||||||
epnew->dentry.file.attr |= cpu_to_le16(ATTR_ARCHIVE);
|
epnew->dentry.file.attr |= cpu_to_le16(ATTR_ARCHIVE);
|
||||||
ei->attr |= 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;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(epnew, epmov, DENTRY_SIZE);
|
*epnew = *epmov;
|
||||||
exfat_update_bh(new_bh, IS_DIRSYNC(inode));
|
exfat_update_bh(new_bh, IS_DIRSYNC(inode));
|
||||||
brelse(mov_bh);
|
brelse(mov_bh);
|
||||||
brelse(new_bh);
|
brelse(new_bh);
|
||||||
|
|
Loading…
Add table
Reference in a new issue