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: 1001356 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=philpotter.co.uk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=philpotter-co-uk.20150623.gappssmtp.com header.i=@philpotter-co-uk.20150623.gappssmtp.com header.b="nmxpKWzN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 430XS101kGz9s3q for ; Thu, 22 Nov 2018 06:18:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387609AbeKVFm3 (ORCPT ); Thu, 22 Nov 2018 00:42:29 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:43048 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387566AbeKVFm3 (ORCPT ); Thu, 22 Nov 2018 00:42:29 -0500 Received: by mail-wr1-f65.google.com with SMTP id r10so6817785wrs.10 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=mQspLFgglsDvO+bx/zvVfMYjlRLuf1XlXDXMANi5gdrWGyoijCMUIDnvZShKDr+8jU 3wh5RZcrje9ZcOeaG8YEsCKK4cIjSH6o/KujcAMEKW0Q0XREGbyt4VJljtavslg27c2J GXl3VDzETXgTc3xixtjj3cvJGdtKHe9T0fnDuFP9ufH3c4nd2FmYVrVLWSFiqUw/vlw7 VeYGAk2BQsxTVXaamfMpVf2Ign96vcpL/VH7woLWDWzD2/M3poPSyqUOTu7mQZtGwE2U bowIXyP1ugV08FMFYINUSvR6eiEeE4+6mM8tBxNGPETCEKFcuvOxtvwytgfMiTRJ4EFp RZvQ== X-Gm-Message-State: AA+aEWZ8xn96so8g9Y3eVNrecRddVVDdGJkvZ0NSqPTsHOwDHW6RuqOZ N6ws0ut0+nX27oH2t+Y1P4n0Lg== 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-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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), From patchwork Wed Nov 21 19:06:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Potter X-Patchwork-Id: 1001355 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=philpotter.co.uk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=philpotter-co-uk.20150623.gappssmtp.com header.i=@philpotter-co-uk.20150623.gappssmtp.com header.b="Rg8tCXt5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 430XRw3WJ9z9s3C for ; Thu, 22 Nov 2018 06:18:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728993AbeKVFyY (ORCPT ); Thu, 22 Nov 2018 00:54:24 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:37193 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731652AbeKVFm3 (ORCPT ); Thu, 22 Nov 2018 00:42:29 -0500 Received: by mail-wr1-f65.google.com with SMTP id j10so6837717wru.4 for ; Wed, 21 Nov 2018 11:06:57 -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=gGQXa+bDUcpquIe5sRQ7xsaexBbdvK/U9/WH/jF100k=; b=Rg8tCXt5XLrIGzAsjwzp70WvYmzORv1+XcuoTe26kA3XU5GPEb7MlFQ4/E6R6h0vyI 1VqOEvC2ys83WHW7evoVbvep+utPd4jB8DZU/ChcLk3JDUR/VneNK7nLhPq/HtCGZr9c BYqJH8XTM35i8c0x7jkSYvM9A9SmsSQTnGOKMLEi2ZaGZfXgJmV9dO4W40kAfi6GkZlP V4Q9Bgl0dZxGbi0iC0dE4y+CO0UgW5B481BMziGBbMTXRN8oSJyILam1seRhkv6oFrbQ y4tieXg5YHgWYdQ5z022z/uRic1C/DoArOJC6Y7USXFIVaCXqkDxgtHG9gJHRjWScDQF jj3g== 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=gGQXa+bDUcpquIe5sRQ7xsaexBbdvK/U9/WH/jF100k=; b=Vy7yN1hDPySP4vFtehPv7ZTAYTnDdqbX9NmludM5IKYLpWXrO3IDC4UnveOsBflfdA JrCYu/uxDH3cqztlkvod2/9szYDXTuFlrqiGAkWVUC265EqxMZ4UK64cyratlUnMCBTn +s3B+1KvG341Wt1hDU+T5zJoH1FS9SOtGA2eklnsDHDfOjXW81LZbVS/4xTg8xD6/PV3 fgjTBqvhLuCDf5RCwJWATwSRSXVhfNkFtvBrSBI1AqghVdk2E7y0hVW9Ncr3LQHDdTLh JLLJdwaIzXmBV6BHSSHNJkNJWDNQxounqa3w0V0EApIuLd7zNaNmClRq7/nNN1ssLG3c 4pww== X-Gm-Message-State: AA+aEWYb8ZUWJuW7XuZgae0/8bOutyQqbFpRonX6kddTCzkOxRiYMOBu ZjVi/X5fB75n5TASDxexzeqnzg== X-Google-Smtp-Source: AFSGD/Uz8vZWfYl1gdOQuGkVRlYfYmux+3kmevXH7z1UhPR4WuVp7rigkjToaLIwLp5K5EBqxQdRhQ== X-Received: by 2002:adf:eec9:: with SMTP id a9mr6786787wrp.242.1542827216548; Wed, 21 Nov 2018 11:06:56 -0800 (PST) Received: from pathfinder (62-64-249-96.dynamic.dsl.as9105.com. [62.64.249.96]) by smtp.gmail.com with ESMTPSA id q14sm5699342wrw.39.2018.11.21.11.06.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Nov 2018 11:06:56 -0800 (PST) Date: Wed, 21 Nov 2018 19:06:55 +0000 From: Phillip Potter To: tytso@mit.edu Cc: amir73il@gmail.com, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [RFC][PATCH v4 05/09] ext4: use common file type conversion Message-ID: <20181121190655.GA7717@pathfinder> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Deduplicate the ext4 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/ext4/ext4.h | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 3f89d0ab08fc..c45d701ba4f4 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2357,16 +2357,13 @@ static inline void ext4_update_dx_flag(struct inode *inode) if (!ext4_has_feature_dir_index(inode->i_sb)) ext4_clear_inode_flag(inode, EXT4_INODE_INDEX); } -static const unsigned char ext4_filetype_table[] = { - DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK -}; static inline unsigned char get_dtype(struct super_block *sb, int filetype) { - if (!ext4_has_feature_filetype(sb) || filetype >= EXT4_FT_MAX) + if (!ext4_has_feature_filetype(sb)) return DT_UNKNOWN; - return ext4_filetype_table[filetype]; + return fs_ftype_to_dtype(filetype); } extern int ext4_check_all_de(struct inode *dir, struct buffer_head *bh, void *buf, int buf_size); @@ -3052,22 +3049,26 @@ extern void initialize_dirent_tail(struct ext4_dir_entry_tail *t, extern int ext4_handle_dirty_dirent_node(handle_t *handle, struct inode *inode, struct buffer_head *bh); -#define S_SHIFT 12 -static const unsigned char ext4_type_by_mode[(S_IFMT >> S_SHIFT) + 1] = { - [S_IFREG >> S_SHIFT] = EXT4_FT_REG_FILE, - [S_IFDIR >> S_SHIFT] = EXT4_FT_DIR, - [S_IFCHR >> S_SHIFT] = EXT4_FT_CHRDEV, - [S_IFBLK >> S_SHIFT] = EXT4_FT_BLKDEV, - [S_IFIFO >> S_SHIFT] = EXT4_FT_FIFO, - [S_IFSOCK >> S_SHIFT] = EXT4_FT_SOCK, - [S_IFLNK >> S_SHIFT] = EXT4_FT_SYMLINK, -}; static inline void ext4_set_de_type(struct super_block *sb, struct ext4_dir_entry_2 *de, umode_t mode) { + /* + * compile-time asserts that generic FT_x types still match + * EXT4_FT_x types + */ + BUILD_BUG_ON(EXT4_FT_UNKNOWN != FT_UNKNOWN); + BUILD_BUG_ON(EXT4_FT_REG_FILE != FT_REG_FILE); + BUILD_BUG_ON(EXT4_FT_DIR != FT_DIR); + BUILD_BUG_ON(EXT4_FT_CHRDEV != FT_CHRDEV); + BUILD_BUG_ON(EXT4_FT_BLKDEV != FT_BLKDEV); + BUILD_BUG_ON(EXT4_FT_FIFO != FT_FIFO); + BUILD_BUG_ON(EXT4_FT_SOCK != FT_SOCK); + BUILD_BUG_ON(EXT4_FT_SYMLINK != FT_SYMLINK); + BUILD_BUG_ON(EXT4_FT_MAX != FT_MAX); + if (ext4_has_feature_filetype(sb)) - de->file_type = ext4_type_by_mode[(mode & S_IFMT)>>S_SHIFT]; + de->file_type = fs_umode_to_ftype(mode); } /* readpages.c */