From patchwork Fri Feb 28 08:40:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kohada.Tetsuhiro@dc.MitsubishiElectric.co.jp" X-Patchwork-Id: 11411809 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3E86214B7 for ; Fri, 28 Feb 2020 08:41:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D62A246A8 for ; Fri, 28 Feb 2020 08:41:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726579AbgB1Il0 (ORCPT ); Fri, 28 Feb 2020 03:41:26 -0500 Received: from mx05.melco.co.jp ([192.218.140.145]:59911 "EHLO mx05.melco.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725877AbgB1Il0 (ORCPT ); Fri, 28 Feb 2020 03:41:26 -0500 Received: from mr05.melco.co.jp (mr05 [133.141.98.165]) by mx05.melco.co.jp (Postfix) with ESMTP id E2A083A41FF; Fri, 28 Feb 2020 17:41:23 +0900 (JST) Received: from mr05.melco.co.jp (unknown [127.0.0.1]) by mr05.imss (Postfix) with ESMTP id 48TNLC5q0WzRk4f; Fri, 28 Feb 2020 17:41:23 +0900 (JST) Received: from mf03_second.melco.co.jp (unknown [192.168.20.183]) by mr05.melco.co.jp (Postfix) with ESMTP id 48TNLC5Vh2zRjtG; Fri, 28 Feb 2020 17:41:23 +0900 (JST) Received: from mf03.melco.co.jp (unknown [133.141.98.183]) by mf03_second.melco.co.jp (Postfix) with ESMTP id 48TNLC5by7zRkCy; Fri, 28 Feb 2020 17:41:23 +0900 (JST) Received: from tux532.tad.melco.co.jp (unknown [133.141.243.226]) by mf03.melco.co.jp (Postfix) with ESMTP id 48TNLC582czRkBN; Fri, 28 Feb 2020 17:41:23 +0900 (JST) Received: from tux532.tad.melco.co.jp by tux532.tad.melco.co.jp (unknown) with ESMTP id 01S8fNiQ028362; Fri, 28 Feb 2020 17:41:23 +0900 Received: from tux390.tad.melco.co.jp (tux390.tad.melco.co.jp [127.0.0.1]) by postfix.imss70 (Postfix) with ESMTP id 6A60A17E075; Fri, 28 Feb 2020 17:41:23 +0900 (JST) Received: from tux554.tad.melco.co.jp (tux100.tad.melco.co.jp [10.168.7.223]) by tux390.tad.melco.co.jp (Postfix) with ESMTP id 541E017E073; Fri, 28 Feb 2020 17:41:23 +0900 (JST) Received: from tux554.tad.melco.co.jp by tux554.tad.melco.co.jp (unknown) with ESMTP id 01S8fNMF032359; Fri, 28 Feb 2020 17:41:23 +0900 From: Tetsuhiro Kohada To: Kohada.Tetsuhiro@dc.MitsubishiElectric.co.jp Cc: Mori.Takahiro@ab.MitsubishiElectric.co.jp, motai.hirotaka@aj.mitsubishielectric.co.jp, Valdis Kletnieks , Greg Kroah-Hartman , linux-fsdevel@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: exfat: remove 'file creation modes' Date: Fri, 28 Feb 2020 17:40:36 +0900 Message-Id: <20200228084037.15123-1-Kohada.Tetsuhiro@dc.MitsubishiElectric.co.jp> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org The mode parameter in ffsCreateFile() and create_file() is redundant. Remove it and definition. Signed-off-by: Tetsuhiro Kohada --- drivers/staging/exfat/exfat.h | 5 +---- drivers/staging/exfat/exfat_core.c | 6 +++--- drivers/staging/exfat/exfat_super.c | 7 +++---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h index f588538c67a8..c863d7566b57 100644 --- a/drivers/staging/exfat/exfat.h +++ b/drivers/staging/exfat/exfat.h @@ -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); diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c index 941094b08dd9..ceaea1ba1a83 100644 --- a/drivers/staging/exfat/exfat_core.c +++ b/drivers/staging/exfat/exfat_core.c @@ -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); diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c index 6f3b72eb999d..708398265828 100644 --- a/drivers/staging/exfat/exfat_super.c +++ b/drivers/staging/exfat/exfat_super.c @@ -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;