From patchwork Tue Mar 26 21:39:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Potter X-Patchwork-Id: 10872209 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 AA6D7925 for ; Tue, 26 Mar 2019 21:39:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94CD42861E for ; Tue, 26 Mar 2019 21:39:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8948128725; Tue, 26 Mar 2019 21:39:33 +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 1C8272861E for ; Tue, 26 Mar 2019 21:39:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731617AbfCZVjb (ORCPT ); Tue, 26 Mar 2019 17:39:31 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42877 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732792AbfCZVja (ORCPT ); Tue, 26 Mar 2019 17:39:30 -0400 Received: by mail-wr1-f68.google.com with SMTP id g3so12633242wrx.9 for ; Tue, 26 Mar 2019 14:39:29 -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=fqttwbkefYLhjgLOmUnmIhg9tAwVEXC65nqj4TIeBL8=; b=WBLFnF5JnKRWzvcENFcBdyhjweG7WkOyaOLYGmmQgsbQ26BuxMZ/7Se16Qi1ju9wE/ clbQwATjNdbMBzsPINuA9hdM3OESW1ZUflE1zsgTrhcx11dddOGtT9nI6LDutHHG6cXL oLRid9WpdVdBKEzWvQSX7fNAQE7QGSRO2twt9Oqebx/iTjoesp5W0BXiE1p8yu88PSZ+ uZdfH1lcTg4NQswOm5md4ENCHg+9bKwuPhdHtM8xtBKbsdKGuvDxDpQyZyos7Gi/F1BK QaEeGxxf3nglrgwlAo733Ij/VWI6ANgofa7Jjf3yauYr2J4ES5oQscrqyME0YdCN9l4u /Uxg== 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=fqttwbkefYLhjgLOmUnmIhg9tAwVEXC65nqj4TIeBL8=; b=Q6vYWJxYv25y1nHaqIkLIb0rcOXw5v/6cBUwHUwgX+UOHkpUO961UBh1/HYuOQ2JN8 V+TS0Zz1aQYeYpqPnQIfRTkYFbPrSWUKsaDWfaxONNvruKx5Z4cvHfOTM0TU4jy7T6ci h0/KbmRIRDS6siY4Z+2575hd4AU7+bOP7fYMf1EP5FpnD4PfcfPpPOeDXsEAQq/18iS0 lG22Lo0KpjlbOZHh4NS7Uht8jduz1WllSa39zHRVHZ59evJhc1vGjgev1/bYPx7gszqI RlcQMUV6Vf/ZgFVlwtvLfuOFoiLxFMMYLWXEJ+DYNOkl1d4ugp8SzAJ8h+Gk4GHjnCM9 1waA== X-Gm-Message-State: APjAAAWbG0jI8Chow+cUBGUMr/yEi4KhKtoUuNITNN3tAU6VUfVh1K7p 5FbkFHAgY43n3HFKgUQSlnGLWQ== X-Google-Smtp-Source: APXvYqxYZw8+0/l8Ok7jA9W3pPs1H8NHmHlJDo6it9yNYtnLUG6W67Ls88dAuGGE+KaPRajVPBAT4w== X-Received: by 2002:a5d:6b4a:: with SMTP id x10mr20559290wrw.63.1553636368584; Tue, 26 Mar 2019 14:39:28 -0700 (PDT) Received: from pathfinder ([90.195.158.41]) by smtp.gmail.com with ESMTPSA id h84sm2008897wmf.15.2019.03.26.14.39.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 26 Mar 2019 14:39:27 -0700 (PDT) Date: Tue, 26 Mar 2019 21:39:26 +0000 From: Phillip Potter To: linux-nilfs@vger.kernel.org Cc: konishi.ryusuke@lab.ntt.co.jp, amir73il@gmail.com, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org Subject: [PATCH v6 06/07] nilfs2: use common file type conversion Message-ID: <20190326213926.GA20881@pathfinder> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.11.3 (2019-02-01) 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 - 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 Common implementation can be found via commit: bbe7449e2599 "fs: common implementation of file type" Signed-off-by: Amir Goldstein Signed-off-by: Phillip Potter Reviewed-by: Jan Kara --- fs/nilfs2/dir.c | 52 ++++++++++-------------------- include/uapi/linux/nilfs2_ondisk.h | 1 + 2 files changed, 18 insertions(+), 35 deletions(-) diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index 81394e22d0a0..f1c297ca8ec5 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -229,35 +229,23 @@ 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_* types still match + * NILFS_FT_* types + */ + 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 +281,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_ftype_to_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..9223b616766b 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 must match common file type values in fs_types.h. */ enum { NILFS_FT_UNKNOWN,