Commit dbcf85e2 authored by Tetsuhiro Kohada's avatar Tetsuhiro Kohada Committed by Greg Kroah-Hartman
Browse files

staging: exfat: remove 'file creation modes' 



The mode parameter in ffsCreateFile() and create_file() is redundant.
Remove it and definition.

Signed-off-by: default avatarTetsuhiro Kohada <Kohada.Tetsuhiro@dc.MitsubishiElectric.co.jp>
Link: https://lore.kernel.org/r/20200228084037.15123-1-Kohada.Tetsuhiro@dc.MitsubishiElectric.co.jp


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2777313c

drivers/staging/exfat/exfat.h

+1 −4
Original line number Diff line number Diff line
@@ -200,9 +200,6 @@ static inline u16 get_row_index(u16 i) 
#define ATTR_EXTEND		0x000F

#define ATTR_RWMASK		0x007E



/* file creation modes */

#define FM_REGULAR              0x00



#define NUM_UPCASE              2918



#ifdef __LITTLE_ENDIAN
@@ -698,7 +695,7 @@ s32 exfat_mount(struct super_block *sb, struct pbr_sector_t *p_pbr); 
s32 create_dir(struct inode *inode, struct chain_t *p_dir,

	       struct uni_name_t *p_uniname, struct file_id_t *fid);

s32 create_file(struct inode *inode, struct chain_t *p_dir,

		struct uni_name_t *p_uniname, u8 mode, struct file_id_t *fid);

		struct uni_name_t *p_uniname, struct file_id_t *fid);

void remove_file(struct inode *inode, struct chain_t *p_dir, s32 entry);

s32 exfat_rename_file(struct inode *inode, struct chain_t *p_dir, s32 old_entry,

		      struct uni_name_t *p_uniname, struct file_id_t *fid);

drivers/staging/exfat/exfat_core.c

+3 −3
Original line number Diff line number Diff line
@@ -2172,7 +2172,7 @@ s32 create_dir(struct inode *inode, struct chain_t *p_dir, 
}



s32 create_file(struct inode *inode, struct chain_t *p_dir,

		struct uni_name_t *p_uniname, u8 mode, struct file_id_t *fid)

		struct uni_name_t *p_uniname, struct file_id_t *fid)

{

	s32 ret, dentry, num_entries;

	struct super_block *sb = inode->i_sb;
@@ -2190,7 +2190,7 @@ s32 create_file(struct inode *inode, struct chain_t *p_dir, 
	/* fill the directory entry information of the created file.

	 * the first cluster is not determined yet. (0)

	 */

	ret = exfat_init_dir_entry(sb, p_dir, dentry, TYPE_FILE | mode,

	ret = exfat_init_dir_entry(sb, p_dir, dentry, TYPE_FILE,

				   CLUSTER_32(0), 0);

	if (ret != 0)

		return ret;
@@ -2204,7 +2204,7 @@ s32 create_file(struct inode *inode, struct chain_t *p_dir, 
	fid->dir.flags = p_dir->flags;

	fid->entry = dentry;



	fid->attr = ATTR_ARCHIVE | mode;

	fid->attr = ATTR_ARCHIVE;

	fid->flags = 0x03;

	fid->size = 0;

	fid->start_clu = CLUSTER_32(~0);

drivers/staging/exfat/exfat_super.c

+3 −4
Original line number Diff line number Diff line
@@ -617,8 +617,7 @@ static int ffsLookupFile(struct inode *inode, char *path, struct file_id_t *fid) 
	return ret;

}



static int ffsCreateFile(struct inode *inode, char *path, u8 mode,

			 struct file_id_t *fid)

static int ffsCreateFile(struct inode *inode, char *path, struct file_id_t *fid)

{

	struct chain_t dir;

	struct uni_name_t uni_name;
@@ -641,7 +640,7 @@ static int ffsCreateFile(struct inode *inode, char *path, u8 mode, 
	fs_set_vol_flags(sb, VOL_DIRTY);



	/* create a new file */

	ret = create_file(inode, &dir, &uni_name, mode, fid);

	ret = create_file(inode, &dir, &uni_name, fid);



#ifndef CONFIG_STAGING_EXFAT_DELAYED_SYNC

	fs_sync(sb, true);
@@ -1834,7 +1833,7 @@ static int exfat_create(struct inode *dir, struct dentry *dentry, umode_t mode, 


	pr_debug("%s entered\n", __func__);



	err = ffsCreateFile(dir, (u8 *)dentry->d_name.name, FM_REGULAR, &fid);

	err = ffsCreateFile(dir, (u8 *)dentry->d_name.name, &fid);

	if (err)

		goto out;