exfat: replace memcpy with structure assignment (a7a24168) · Commits · 戴 / test

fs/exfat/dir.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -978,11 +978,8 @@ rewind:
		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);

fs/exfat/inode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

fs/exfat/namei.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -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);

Admin message