From patchwork Sat Oct 27 00:53:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Potter X-Patchwork-Id: 10657997 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 2DC065A4 for ; Sat, 27 Oct 2018 00:53:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 208712C898 for ; Sat, 27 Oct 2018 00:53:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F2BB2C9CC; Sat, 27 Oct 2018 00:53:43 +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 A8CDA2C898 for ; Sat, 27 Oct 2018 00:53:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726563AbeJ0Jcv (ORCPT ); Sat, 27 Oct 2018 05:32:51 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:35483 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726439AbeJ0Jcv (ORCPT ); Sat, 27 Oct 2018 05:32:51 -0400 Received: by mail-wm1-f65.google.com with SMTP id q12-v6so172112wmq.0 for ; Fri, 26 Oct 2018 17:53:39 -0700 (PDT) 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=PHX1SO3rRY7Yngp6/js7WU2kc5FJwnpwtmBjJqd2mLM=; b=XfrRFx8IwZhmvn76gY9Di7363sW372PdEAlMBR85z7k4Uwh/VWkOHDeDIxFS4YGm+I +31XyfjRP6iHmMbS+E5OamLZYg9eEK68D1Fz5qivU/6molJJPeL+wIvu9rRBR7IsCL5H wIlvMZ/khrhE4MfVzQ5X4PJ/uxpKSMjohYJmb7EiMZgfa46L1HQ17uZXBXDmsau64Rsy qn1fd3RKL3Cqm17BxbYTBcXyIOoV2ufxStfOZqBsoPV3L387TSmSbQMZaRxjTl/L/XAw OJ/tHNZJr3B/sIdoJtZe3XBtxh+PMn3LVah2b+5AXLB9bYYuzawz0cZKmu7CFWoZkB05 0H2A== 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=PHX1SO3rRY7Yngp6/js7WU2kc5FJwnpwtmBjJqd2mLM=; b=hVizri59MRw3hNhTdAxORjVl5V7xzZkwB65yaeyWcnt46ThtS94ilwr2Wex0mYDusi ES+sRq/sXkV8hFR5oF3Sf8OS+TZezI/nkh5dIE59KctqxEtwSo7Xp1cHxdOIFLZm7xwj nDY0fLzhzx2qoypTnxMRyLPdKuojqHaTKea9yOJYcHEqxaPqQMoRxiPHH1+ac7AFMy2S 0n0sjDYPLP6ww3fGAfbMkGmRgqJJKU4V25tjUcrqXRkR7gbj/CgzJxykiuRV0VRISz5A dh0K5t5eo+m83j2+/lz5jOClCPjwzzfXGz4bXN2LiK60hrCf0UakqtqRC+RQIiTw12Va /7pQ== X-Gm-Message-State: AGRZ1gKqsNJ9UiPBojJNjT03MApcmZ0P+khVSnGfA/n4ZYA90tXP0qCM qP3oK4qNhDWEuZlibEU+lT9zXw== X-Google-Smtp-Source: AJdET5dsDKVd2UrAemdPT9dsW4/XX4pb2FQJYiL/JO5NyJAm4QkAQmV7iBZRTky/3Wq/LYvtO9cypQ== X-Received: by 2002:a1c:a5c5:: with SMTP id o188-v6mr3257932wme.101.1540601618323; Fri, 26 Oct 2018 17:53:38 -0700 (PDT) Received: from pathfinder (62-64-249-96.dynamic.dsl.as9105.com. [62.64.249.96]) by smtp.gmail.com with ESMTPSA id l67-v6sm14777393wma.20.2018.10.26.17.53.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Oct 2018 17:53:37 -0700 (PDT) Date: Sat, 27 Oct 2018 01:53:37 +0100 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 v3 04/10] ext2: use common file type conversion Message-ID: <20181027005337.GA9954@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 --- 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),