From patchwork Mon Jan 21 00:54:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Potter X-Patchwork-Id: 10773081 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE1891390 for ; Mon, 21 Jan 2019 08:09:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF4D329E1A for ; Mon, 21 Jan 2019 08:09:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D37D929E1E; Mon, 21 Jan 2019 08:09:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DATE_IN_PAST_06_12, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CB3729E1A for ; Mon, 21 Jan 2019 08:09:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728155AbfAUIJo (ORCPT ); Mon, 21 Jan 2019 03:09:44 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:34925 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727695AbfAUIJo (ORCPT ); Mon, 21 Jan 2019 03:09:44 -0500 Received: by mail-wr1-f68.google.com with SMTP id 96so22164006wrb.2 for ; Mon, 21 Jan 2019 00:09:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philpotter-co-uk.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=b1ecWGjFT6d1T5p3dxeI6vc6FF1dU5B029yQqjeDrsI=; b=DnY407LuA7nLzq5vKkQZV4bQgj7N9CdwGy9rCNBS8uWAROQrSnmH1OAgNe/9h3D2FO 66vSkBzopKOn5NQmYzBaDmpT7eSLYYSJoRM9HLhxiMIyqdX4VJPClwa2Z+YPa8qS80WC lJ7i2u82IngoeRO0JQXco6SEoDru73igNkKgbgZRx/X6W+l3e/TAgJ6cg+0gg4fwO+PE R1jOIY47NI9G7SK1VVBGmw8CTpsQQXbC6rRWDXiDwjGaPXqoS/pxle5sKb40O5hgWZFh IUwjIO+R7DuyVW8mcVm/d0wZRcGPQKXJDAkvqW/vEHm8s/MIArCGawMdryRFgTcrYwjY hswA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=b1ecWGjFT6d1T5p3dxeI6vc6FF1dU5B029yQqjeDrsI=; b=nIPdw1K0/uDmbpDmT03ED/y+coaPF5ZOqAs23mV9RjthQiu1D1Gcu7xPXb+XTJwBKG WsSLzksDWzVFq/Lc6w0rba/aE+Be3P4mPmWkETdlrBOc3fDVw5x1S0ZRIdxfO1WfUGcQ GRi4W8eR/+3cI2QozaSCoTHDn3PdSDi3ysLPPvzdJxR5Pt9UvzlSaL9ka+HVeGBKJR5A j4GOQy7FWi0GlWJrKCCIr87/n/XlMeTbksLajQTRDuksuuCCJLMuT8ITXtAs4zZeFcnD A3C+KZOwPAlIb0sy968bfAdEamZs0w/Bwb0K0Wj/fRHqur/TaE7OmfQ4sHEAkL9U4fGC WrGg== X-Gm-Message-State: AJcUukdXJgmgAl4dXc4aqyXeUeqchu8Gd8roovfG2PY/Pcp5ne2lV+mF hfSPaSBkDtH2AIlio/LvFCLHuA93cxQGJWP8 X-Google-Smtp-Source: ALg8bN7WntRVqDNhcrhn5iR8haEIz/6ZhcDG9NPsMdNTLmzgMibrML3hmiLF/jCrXOE2wAElOKwSFA== X-Received: by 2002:a5d:4acb:: with SMTP id y11mr25054213wrs.281.1548032075304; Sun, 20 Jan 2019 16:54:35 -0800 (PST) Received: from pathfinder ([90.222.17.17]) by smtp.gmail.com with ESMTPSA id 198sm86101874wmt.36.2019.01.20.16.54.34 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 20 Jan 2019 16:54:34 -0800 (PST) Date: Mon, 21 Jan 2019 00:54:34 +0000 From: Phillip Potter To: jaegeuk@kernel.org Cc: amir73il@gmail.com, viro@zeniv.linux.org.uk, yuchao0@huawei.com, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Subject: [RFC][PATCH v5 06/09] f2fs: use common file type conversion Message-ID: <20190121005434.GA32358@pathfinder> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Deduplicate the f2fs file type conversion implementation and remove F2FS_FT_* definitions - file systems that use the same file types as defined by POSIX do not need to define their own versions and can use the common helper functions decared in fs_types.h and implemented in fs_types.c Signed-off-by: Amir Goldstein Signed-off-by: Phillip Potter Reviewed-by: Chao Yu --- fs/f2fs/dir.c | 27 ++------------------------- fs/f2fs/inline.c | 2 +- include/linux/f2fs_fs.h | 15 --------------- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 50d0d36280fa..797e926388ea 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -36,37 +36,14 @@ static unsigned int bucket_blocks(unsigned int level) return 4; } -static unsigned char f2fs_filetype_table[F2FS_FT_MAX] = { - [F2FS_FT_UNKNOWN] = DT_UNKNOWN, - [F2FS_FT_REG_FILE] = DT_REG, - [F2FS_FT_DIR] = DT_DIR, - [F2FS_FT_CHRDEV] = DT_CHR, - [F2FS_FT_BLKDEV] = DT_BLK, - [F2FS_FT_FIFO] = DT_FIFO, - [F2FS_FT_SOCK] = DT_SOCK, - [F2FS_FT_SYMLINK] = DT_LNK, -}; - -static unsigned char f2fs_type_by_mode[S_IFMT >> S_SHIFT] = { - [S_IFREG >> S_SHIFT] = F2FS_FT_REG_FILE, - [S_IFDIR >> S_SHIFT] = F2FS_FT_DIR, - [S_IFCHR >> S_SHIFT] = F2FS_FT_CHRDEV, - [S_IFBLK >> S_SHIFT] = F2FS_FT_BLKDEV, - [S_IFIFO >> S_SHIFT] = F2FS_FT_FIFO, - [S_IFSOCK >> S_SHIFT] = F2FS_FT_SOCK, - [S_IFLNK >> S_SHIFT] = F2FS_FT_SYMLINK, -}; - static void set_de_type(struct f2fs_dir_entry *de, umode_t mode) { - de->file_type = f2fs_type_by_mode[(mode & S_IFMT) >> S_SHIFT]; + de->file_type = fs_umode_to_ftype(mode); } unsigned char f2fs_get_de_type(struct f2fs_dir_entry *de) { - if (de->file_type < F2FS_FT_MAX) - return f2fs_filetype_table[de->file_type]; - return DT_UNKNOWN; + return fs_ftype_to_dtype(de->file_type); } static unsigned long dir_block_index(unsigned int level, diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index d636cbcf68f2..8b4648221820 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -458,7 +458,7 @@ static int f2fs_add_inline_entries(struct inode *dir, void *inline_dentry) new_name.len = le16_to_cpu(de->name_len); ino = le32_to_cpu(de->ino); - fake_mode = f2fs_get_de_type(de) << S_SHIFT; + fake_mode = f2fs_get_de_type(de) << S_DT_SHIFT; err = f2fs_add_regular_entry(dir, &new_name, NULL, NULL, ino, fake_mode); diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h index d7711048ef93..2961c3477e95 100644 --- a/include/linux/f2fs_fs.h +++ b/include/linux/f2fs_fs.h @@ -524,21 +524,6 @@ struct f2fs_dentry_block { __u8 filename[NR_DENTRY_IN_BLOCK][F2FS_SLOT_LEN]; } __packed; -/* file types used in inode_info->flags */ -enum { - F2FS_FT_UNKNOWN, - F2FS_FT_REG_FILE, - F2FS_FT_DIR, - F2FS_FT_CHRDEV, - F2FS_FT_BLKDEV, - F2FS_FT_FIFO, - F2FS_FT_SOCK, - F2FS_FT_SYMLINK, - F2FS_FT_MAX -}; - -#define S_SHIFT 12 - #define F2FS_DEF_PROJID 0 /* default project ID */ #endif /* _LINUX_F2FS_FS_H */