From patchwork Sat Oct 27 00:53:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Potter X-Patchwork-Id: 989806 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="VBtqoG+l"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42hj8M48zfz9s9G for ; Sat, 27 Oct 2018 11:55:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726679AbeJ0Jcy (ORCPT ); Sat, 27 Oct 2018 05:32:54 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:36640 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726439AbeJ0Jcx (ORCPT ); Sat, 27 Oct 2018 05:32:53 -0400 Received: by mail-wm1-f66.google.com with SMTP id a8-v6so2909171wmf.1 for ; Fri, 26 Oct 2018 17:53:41 -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=5N2xVUBHPhw7AudvB1PS6mp/18GuiE6rSuJneF3xlM8=; b=VBtqoG+lh9A2jnChQlYSjXpfhRnSHG5YTrosfdRDt7dj+nvYE9J6oo8l2P+cjdXhqu 1OBSAwmnR7WcVFlO9czZcOTEoXhYp2r5tdczpDZ0u0031i01m8AKnY4mStYYtW8MD/7H +u2eW3XSryCi2KMnG9gXQSxh9yMy7VGls0gB2Z2Jzu/BO1/e7K5UdHBp92P4/Jp6v2lJ yMPMvouO+gDwM47DCctvQloVG3Bz8QV/wSMqcNjY4KfECnUyIsI1/i6kpBpNPxq1DRxr 9RE7KrZtS9AU4t9rsO2DwCRPGTptgOgjerslGX7q4IpTSaCrDkSr8sDkZK2yFeAl82fU migA== 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=5N2xVUBHPhw7AudvB1PS6mp/18GuiE6rSuJneF3xlM8=; b=EVIrLWq9FLz1ny4YkxDl7uCK6NNMWY6IPL82EwVEtq+1a4GYeJkXeSABKjAniHX4+j ROqrY6vcps6Nhp3HajZBGytIjyWXB/F5BQLjgFP1foIJ51kVET+LBo9nLRRSxxuSVdmg 8/ph+iX436Dq9pjTgmQCZUZfPsbtSCEwhufceOvzU2Y5zPdLqnnPzbkk8GacptNwb5Ig nbHXOQTvWRp24I4kEUHEImrkne4Qbt60dVAruoZVte92t8i8Qxc5gFABVAycAM2RAFpV xatRSFYaYVNj/Lw3ODXFU4WRH3QbcbwPJpvvwZty4FsW8OBu1nmgATd/XgBt1QqCX3+s Vg0Q== X-Gm-Message-State: AGRZ1gIGHrUdmZ6sPeA37a6q5k21VyFexytIcT5dDcLaNvimew7MjmUr LH0bdlWqvyKgGoSIBjlFFHEJDA== X-Google-Smtp-Source: AJdET5e92sjZniKhW5kqzNT0tjc+ATgTn/8SoU45/3Rl4JXXndyXNGhUqk9Nee8VoqEqQmWYHRbLYA== X-Received: by 2002:a1c:a184:: with SMTP id k126-v6mr113434wme.32.1540601620906; Fri, 26 Oct 2018 17:53:40 -0700 (PDT) Received: from pathfinder (62-64-249-96.dynamic.dsl.as9105.com. [62.64.249.96]) by smtp.gmail.com with ESMTPSA id e14-v6sm9042917wrs.69.2018.10.26.17.53.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Oct 2018 17:53:40 -0700 (PDT) Date: Sat, 27 Oct 2018 01:53:39 +0100 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 v3 06/10] ext4: use common file type conversion Message-ID: <20181027005339.GA9968@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 --- 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 caff935fbeb8..88c65ce70413 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2361,16 +2361,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); @@ -3055,22 +3052,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 */