From patchwork Tue Oct 23 20:20:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Potter X-Patchwork-Id: 10653611 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 F3AF413A9 for ; Tue, 23 Oct 2018 20:20:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCD792A3EB for ; Tue, 23 Oct 2018 20:20:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB5A22A3FC; Tue, 23 Oct 2018 20:20:14 +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 6D5A12A3EB for ; Tue, 23 Oct 2018 20:20:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729086AbeJXEpE (ORCPT ); Wed, 24 Oct 2018 00:45:04 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:51846 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729040AbeJXEpD (ORCPT ); Wed, 24 Oct 2018 00:45:03 -0400 Received: by mail-wm1-f66.google.com with SMTP id 143-v6so3069903wmf.1 for ; Tue, 23 Oct 2018 13:20:06 -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=jSWvX4QxrsoC+ZiESoxasWdqpZ9hWx9gFFsef9JZrNg=; b=nmOCSLyY/o648Zx1j6VahFWJsTKRtVgwiKM6YiDRixuYevAjr6y84Y5V6M2TxMMhku RUJvawazuUOV11ZO8bTvmHMpzqkq3L+kFG3dXLxomNtxwwOR8hUBZWwd45TKCT4AgA2j LDw9GiMTVvrxzWhhGvIq7Or7icdmuH5MTAXYipZ7RJGMXWDAmqexd3X2nSn7cBLK3sig gAOOHGIs4Tza1uOKfn0cSMy+DgI9cY1AOy1s++zqFIsxcaNIanShGM+xwXU3JzMaYXOC Aa+J29/IfWv9G3LyW9WsdGZdHCQUdgzqpgIWky3eUF/AMlNak7iusxNvfsnYRSfp4Cmj iRTw== 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=jSWvX4QxrsoC+ZiESoxasWdqpZ9hWx9gFFsef9JZrNg=; b=qDrBGSaavshaQA5V2o2aSgYN+88x8Jp+7ecv7BA8SBSuBsKqVaSYYB//A2bXN5ToLM hAR7ZXSeYfEYdDqvUFSGTeyvwFf4HXDi29xgTMYryn1A/Ad7nsVWv/vSncUbKKovoUsf Pb5rqWeGAGGwD1bTCQp/JgHk0naphdIIsUc+KHCfA81ZwRkQcGdmPQJTeD1MCu0ZPIgZ ivyFCluUdLmozn17nSiiFgvMRW69a12pe7WCu5ZLQhw1Qi+yKXfH0kqhMJVUgB130rDn mnOaYUmQnyH5undWc5buCIzuzsGflGzs7xTruKe/RplZd/Q84YYoDGwMTPesYFVP4OUq c6yg== X-Gm-Message-State: ABuFfoiA2brfnbw9cf/3zlB3ucGIpwAy+gACqUM4kDvWvRkv8kSz40OX WocM6uaHkaQzKR6WrQBrWCUNMA== X-Google-Smtp-Source: ACcGV62CkJWOfwMoq/Yj3fPlZ1mbZRYVCy0z6ZabJ6ipvTg/3HYXNyK1K1Teh01kuPkZDojRx5jh+w== X-Received: by 2002:a1c:9f41:: with SMTP id i62-v6mr23061793wme.53.1540326005409; Tue, 23 Oct 2018 13:20:05 -0700 (PDT) Received: from pathfinder (62-64-249-96.dynamic.dsl.as9105.com. [62.64.249.96]) by smtp.gmail.com with ESMTPSA id z185-v6sm4373951wmz.47.2018.10.23.13.20.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Oct 2018 13:20:04 -0700 (PDT) Date: Tue, 23 Oct 2018 21:20:04 +0100 From: Phillip Potter To: linux-nilfs@vger.kernel.org Cc: linux-kernel@vger.kernel.org, amir73il@gmail.com, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org Subject: [RFC][PATCH v2 09/10] nilfs2: use common file type conversion Message-ID: <20181023202004.GA15745@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 nilfs2 file type conversion implementation. Original patch by Amir Goldstein. v2: - Compile-time checks added by Phillip Potter to make sure the NILFS_FT_x enum values stay same as FT_x values v1: - Initial implementation Signed-off-by: Phillip Potter --- fs/nilfs2/dir.c | 54 +++++++++++------------------- include/uapi/linux/nilfs2_ondisk.h | 1 + 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index 81394e22d0a0..168238278d24 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -229,35 +229,25 @@ static struct nilfs_dir_entry *nilfs_next_entry(struct nilfs_dir_entry *p) nilfs_rec_len_from_disk(p->rec_len)); } -static unsigned char -nilfs_filetype_table[NILFS_FT_MAX] = { - [NILFS_FT_UNKNOWN] = DT_UNKNOWN, - [NILFS_FT_REG_FILE] = DT_REG, - [NILFS_FT_DIR] = DT_DIR, - [NILFS_FT_CHRDEV] = DT_CHR, - [NILFS_FT_BLKDEV] = DT_BLK, - [NILFS_FT_FIFO] = DT_FIFO, - [NILFS_FT_SOCK] = DT_SOCK, - [NILFS_FT_SYMLINK] = DT_LNK, -}; - -#define S_SHIFT 12 -static unsigned char -nilfs_type_by_mode[S_IFMT >> S_SHIFT] = { - [S_IFREG >> S_SHIFT] = NILFS_FT_REG_FILE, - [S_IFDIR >> S_SHIFT] = NILFS_FT_DIR, - [S_IFCHR >> S_SHIFT] = NILFS_FT_CHRDEV, - [S_IFBLK >> S_SHIFT] = NILFS_FT_BLKDEV, - [S_IFIFO >> S_SHIFT] = NILFS_FT_FIFO, - [S_IFSOCK >> S_SHIFT] = NILFS_FT_SOCK, - [S_IFLNK >> S_SHIFT] = NILFS_FT_SYMLINK, -}; - static void nilfs_set_de_type(struct nilfs_dir_entry *de, struct inode *inode) { - umode_t mode = inode->i_mode; - - de->file_type = nilfs_type_by_mode[(mode & S_IFMT)>>S_SHIFT]; + /* + * compile-time asserts that generic FT_x types + * still match NILFS_FT_x types - no need to list + * in other functions as well as build will + * fail either way + */ + BUILD_BUG_ON(NILFS_FT_UNKNOWN != FT_UNKNOWN); + BUILD_BUG_ON(NILFS_FT_REG_FILE != FT_REG_FILE); + BUILD_BUG_ON(NILFS_FT_DIR != FT_DIR); + BUILD_BUG_ON(NILFS_FT_CHRDEV != FT_CHRDEV); + BUILD_BUG_ON(NILFS_FT_BLKDEV != FT_BLKDEV); + BUILD_BUG_ON(NILFS_FT_FIFO != FT_FIFO); + BUILD_BUG_ON(NILFS_FT_SOCK != FT_SOCK); + BUILD_BUG_ON(NILFS_FT_SYMLINK != FT_SYMLINK); + BUILD_BUG_ON(NILFS_FT_MAX != FT_MAX); + + de->file_type = fs_umode_to_ftype(inode->i_mode); } static int nilfs_readdir(struct file *file, struct dir_context *ctx) @@ -293,15 +283,9 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx) return -EIO; } if (de->inode) { - unsigned char t; - - if (de->file_type < NILFS_FT_MAX) - t = nilfs_filetype_table[de->file_type]; - else - t = DT_UNKNOWN; - if (!dir_emit(ctx, de->name, de->name_len, - le64_to_cpu(de->inode), t)) { + le64_to_cpu(de->inode), + fs_dtype(de->file_type))) { nilfs_put_page(page); return 0; } diff --git a/include/uapi/linux/nilfs2_ondisk.h b/include/uapi/linux/nilfs2_ondisk.h index a7e66ab11d1d..90362b1957f1 100644 --- a/include/uapi/linux/nilfs2_ondisk.h +++ b/include/uapi/linux/nilfs2_ondisk.h @@ -309,6 +309,7 @@ struct nilfs_dir_entry { /* * NILFS directory file types. Only the low 3 bits are used. The * other bits are reserved for now. + * Values should match common file type values in file_type.h. */ enum { NILFS_FT_UNKNOWN,