From patchwork Wed Nov 21 19:06:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Potter X-Patchwork-Id: 10693127 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 6F80F13B5 for ; Wed, 21 Nov 2018 19:18:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59E782C343 for ; Wed, 21 Nov 2018 19:18:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D5752C34A; Wed, 21 Nov 2018 19:18:57 +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=-7.9 required=2.0 tests=BAYES_00,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 D71202C343 for ; Wed, 21 Nov 2018 19:18:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387608AbeKVFm3 (ORCPT ); Thu, 22 Nov 2018 00:42:29 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39597 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387602AbeKVFm2 (ORCPT ); Thu, 22 Nov 2018 00:42:28 -0500 Received: by mail-wr1-f68.google.com with SMTP id b13so6853374wrx.6 for ; Wed, 21 Nov 2018 11:06:55 -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=mHTiNOHUO3nA1QO3XFEye0LzKiE5YqwnxNna/rvgGtw=; b=nmxpKWzNH70CsefUZ7I+Zg7sesehrnb+gC9k7qepYnlaAvhOEAVFzCvTaxmccqxmVu d33AY4WYApOf0ZCB+ILLfvMqWor1q5qiRBpaicdE5sqTCByo2TvoIEnm6Z65vv0NpFqt n9hEXTirE1cvyB+dvQn0g1lxYN8fbtu5UYfWFJ7k3g5CfOe/2EDh+a2dMaINscwf1J72 4QTQJTvz+HwNLdMzXrFMo1KBB4TlNifkNavfbQt6DKEfjOouCCSlQ9wOuTBvqGiArlBj f9ztoco29AamJx4ahrPvsPx3PMyAqroL8RiN+aO5Fhgjg6uQzI3YsBg6Q5D2lkK7538E k8/g== 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=mHTiNOHUO3nA1QO3XFEye0LzKiE5YqwnxNna/rvgGtw=; b=LI4XIQURorfKy6s+jlpJ1tgt2FmZaXEdi2duyIiX9Qel323dyfNQefuA0Bs9b8Kwc8 LRP0usmCK2V4bpScy1Zci/RubtGBS6G3xgXo4u3eVNhwByWJbo4HTWW47dGK9DW5S6tt mCwYk47cnvO3yewl6pXC8+2jH50gzUpVYMiiKp6lf2yO9h1bBy4yTK2JhAHdEYfNKmsl 0XT2+lkUauXE28NkuGwIXSYxhMWAngVHOFk6sKFlhsuuBPPTGKdGBCT/rutjcOTTfdjT Qip1lu09mBD9l1LNoSR9KuOtraANFby95m0ffJ3AWVBsqd5UeDfeY1gUqDeoyl2KKXWw 7ZWQ== X-Gm-Message-State: AA+aEWZa0rMH3210rr5t1wJd6s8lLkmRzhyYHHRPvE/dd9YcCJrIajID PYINSpQnLjNCEWlAA4sc3MjELA== X-Google-Smtp-Source: AFSGD/VwoXeuW9UgERTjvpXL3HocbdqjDNJ9zuA/Uh/9qhTy55ZxPTc3+Bt30Fq3ngTNqp2TLeGRLA== X-Received: by 2002:adf:c745:: with SMTP id b5-v6mr6798317wrh.197.1542827215144; Wed, 21 Nov 2018 11:06:55 -0800 (PST) Received: from pathfinder (62-64-249-96.dynamic.dsl.as9105.com. [62.64.249.96]) by smtp.gmail.com with ESMTPSA id h125-v6sm866692wmf.48.2018.11.21.11.06.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Nov 2018 11:06:54 -0800 (PST) Date: Wed, 21 Nov 2018 19:06:53 +0000 From: Phillip Potter To: jack@suse.com Cc: amir73il@gmail.com, viro@zeniv.linux.org.uk, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [RFC][PATCH v4 04/09] ext2: use common file type conversion Message-ID: <20181121190653.GA7710@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 ext2 file type conversion implementation - 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: Jan Kara --- fs/ext2/dir.c | 49 ++++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c index 3b8114def693..bd30fe266373 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c @@ -252,33 +252,24 @@ ext2_validate_entry(char *base, unsigned offset, unsigned mask) return (char *)p - base; } -static unsigned char ext2_filetype_table[EXT2_FT_MAX] = { - [EXT2_FT_UNKNOWN] = DT_UNKNOWN, - [EXT2_FT_REG_FILE] = DT_REG, - [EXT2_FT_DIR] = DT_DIR, - [EXT2_FT_CHRDEV] = DT_CHR, - [EXT2_FT_BLKDEV] = DT_BLK, - [EXT2_FT_FIFO] = DT_FIFO, - [EXT2_FT_SOCK] = DT_SOCK, - [EXT2_FT_SYMLINK] = DT_LNK, -}; - -#define S_SHIFT 12 -static unsigned char ext2_type_by_mode[S_IFMT >> S_SHIFT] = { - [S_IFREG >> S_SHIFT] = EXT2_FT_REG_FILE, - [S_IFDIR >> S_SHIFT] = EXT2_FT_DIR, - [S_IFCHR >> S_SHIFT] = EXT2_FT_CHRDEV, - [S_IFBLK >> S_SHIFT] = EXT2_FT_BLKDEV, - [S_IFIFO >> S_SHIFT] = EXT2_FT_FIFO, - [S_IFSOCK >> S_SHIFT] = EXT2_FT_SOCK, - [S_IFLNK >> S_SHIFT] = EXT2_FT_SYMLINK, -}; - static inline void ext2_set_de_type(ext2_dirent *de, struct inode *inode) { - umode_t mode = inode->i_mode; + /* + * compile-time asserts that generic FT_x types still match + * EXT2_FT_x types + */ + BUILD_BUG_ON(EXT2_FT_UNKNOWN != FT_UNKNOWN); + BUILD_BUG_ON(EXT2_FT_REG_FILE != FT_REG_FILE); + BUILD_BUG_ON(EXT2_FT_DIR != FT_DIR); + BUILD_BUG_ON(EXT2_FT_CHRDEV != FT_CHRDEV); + BUILD_BUG_ON(EXT2_FT_BLKDEV != FT_BLKDEV); + BUILD_BUG_ON(EXT2_FT_FIFO != FT_FIFO); + BUILD_BUG_ON(EXT2_FT_SOCK != FT_SOCK); + BUILD_BUG_ON(EXT2_FT_SYMLINK != FT_SYMLINK); + BUILD_BUG_ON(EXT2_FT_MAX != FT_MAX); + if (EXT2_HAS_INCOMPAT_FEATURE(inode->i_sb, EXT2_FEATURE_INCOMPAT_FILETYPE)) - de->file_type = ext2_type_by_mode[(mode & S_IFMT)>>S_SHIFT]; + de->file_type = fs_umode_to_ftype(inode->i_mode); else de->file_type = 0; } @@ -293,14 +284,14 @@ ext2_readdir(struct file *file, struct dir_context *ctx) unsigned long n = pos >> PAGE_SHIFT; unsigned long npages = dir_pages(inode); unsigned chunk_mask = ~(ext2_chunk_size(inode)-1); - unsigned char *types = NULL; bool need_revalidate = !inode_eq_iversion(inode, file->f_version); + bool has_filetype; if (pos > inode->i_size - EXT2_DIR_REC_LEN(1)) return 0; - if (EXT2_HAS_INCOMPAT_FEATURE(sb, EXT2_FEATURE_INCOMPAT_FILETYPE)) - types = ext2_filetype_table; + has_filetype = + EXT2_HAS_INCOMPAT_FEATURE(sb, EXT2_FEATURE_INCOMPAT_FILETYPE); for ( ; n < npages; n++, offset = 0) { char *kaddr, *limit; @@ -335,8 +326,8 @@ ext2_readdir(struct file *file, struct dir_context *ctx) if (de->inode) { unsigned char d_type = DT_UNKNOWN; - if (types && de->file_type < EXT2_FT_MAX) - d_type = types[de->file_type]; + if (has_filetype) + d_type = fs_ftype_to_dtype(de->file_type); if (!dir_emit(ctx, de->name, de->name_len, le32_to_cpu(de->inode),