From patchwork Sat Oct 27 00:53:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Potter X-Patchwork-Id: 10658003 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 839CB13BF for ; Sat, 27 Oct 2018 00:53:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 722C12AED8 for ; Sat, 27 Oct 2018 00:53:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70ABD2C9D3; Sat, 27 Oct 2018 00:53:46 +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 EB20F2AED8 for ; Sat, 27 Oct 2018 00:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726740AbeJ0Jcz (ORCPT ); Sat, 27 Oct 2018 05:32:55 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38509 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726496AbeJ0Jcz (ORCPT ); Sat, 27 Oct 2018 05:32:55 -0400 Received: by mail-wr1-f67.google.com with SMTP id d10-v6so2956785wrs.5 for ; Fri, 26 Oct 2018 17:53:43 -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=RW/2NFHnHX6ODxx5TOnuTGUrdaVAPGTF+0x0OB3GQKU=; b=K+4YWE5mwlw9LyJAJgt5ODyt2hU9U195P7oDnJQmwAis2Jab4feaPO2PP/c8Lfc12z nx1oGMGNxKqI2kPpKu0enfInZ5isWn8xY78jmQHeRNJYz+46qGTZQ8Uwho17F2OAh2gd O0f5cuKCxP5muk466k5a8bFPI3qMFvueLrRypeERkt5W3T2zI0tMkin2zbMy3IO90ZDA Lin+XPRHhoc6Ub3lmhAszCMLdFPu1dRQ8BLJ7fjSq2AndzwVROBaFZgBOV6Ddp9QwpV+ Wv8rq/UOsYA915DtIqgENjhic3f2Qfv6lRhBlXVh5T0exIBuKZbJfX5GVezBq1wcjxlX R3Ig== 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=RW/2NFHnHX6ODxx5TOnuTGUrdaVAPGTF+0x0OB3GQKU=; b=TKSTdNAnLsY/RucU2ZkFwuaajH9loV8jfWeob+R8j5Zps/HR2g+ZK7tGyku61ASYuf xasluUHU4ryzQuTWgULmURC23ChmPICTYpGM4V8WN5+uo6Iw89fty43B0F+veDzUeS8L gBTxR0zgRuZYYCS8Tbp1uNTKvM14MdobmNAWlU6YYZ+YOw7futP6SnoNH2TZWjhShE11 wd8fHDMpT/dvWYKomHmFFKMtNmmXwqDKw5itAAqDZFTCIoKsJ+juFJkM7erIfpir03YH QJclk7Kka7Px3O5KF3Ck8491Yn0RvvH8pLcoBKPTrynSx1ubh6wYEa7avIkHFz9e6qvk VBRg== X-Gm-Message-State: AGRZ1gJ7hWH0lDBpsTjotI1dLCdJr2Pvq3naMhARnWHkxmul5VVtlvOA qJILY49YOkRMIYaQ5StJcZDAEg== X-Google-Smtp-Source: AJdET5fKkjs+tTOxaHv4in+/j8slbJPuM96yiDKA6tJhcsG7NK3+jEvRBlYOCTYiFtAjmssgMAWlFg== X-Received: by 2002:a5d:68c6:: with SMTP id p6-v6mr8030669wrw.34.1540601622261; Fri, 26 Oct 2018 17:53:42 -0700 (PDT) Received: from pathfinder (62-64-249-96.dynamic.dsl.as9105.com. [62.64.249.96]) by smtp.gmail.com with ESMTPSA id i8-v6sm12818792wru.48.2018.10.26.17.53.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Oct 2018 17:53:41 -0700 (PDT) Date: Sat, 27 Oct 2018 01:53:40 +0100 From: Phillip Potter To: mark@fasheh.com Cc: amir73il@gmail.com, viro@zeniv.linux.org.uk, jlbec@evilplan.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: [RFC][PATCH v3 07/10] ocfs2: use common file type conversion Message-ID: <20181027005340.GA9975@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 ocfs2 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/ocfs2/dir.c | 18 +++--------------- fs/ocfs2/ocfs2_fs.h | 27 +++++++++++++++------------ 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index b048d4fa3959..05b691674417 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -69,10 +69,6 @@ #define NAMEI_RA_BLOCKS 4 #define NAMEI_RA_SIZE (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS) -static unsigned char ocfs2_filetype_table[] = { - DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK -}; - static int ocfs2_do_extend_dir(struct super_block *sb, handle_t *handle, struct inode *dir, @@ -1803,13 +1799,9 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, } offset += le16_to_cpu(de->rec_len); if (le64_to_cpu(de->inode)) { - unsigned char d_type = DT_UNKNOWN; - - if (de->file_type < OCFS2_FT_MAX) - d_type = ocfs2_filetype_table[de->file_type]; - if (!dir_emit(ctx, de->name, de->name_len, - le64_to_cpu(de->inode), d_type)) + le64_to_cpu(de->inode), + fs_ftype_to_dtype(de->file_type))) goto out; } ctx->pos += le16_to_cpu(de->rec_len); @@ -1901,14 +1893,10 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode, continue; } if (le64_to_cpu(de->inode)) { - unsigned char d_type = DT_UNKNOWN; - - if (de->file_type < OCFS2_FT_MAX) - d_type = ocfs2_filetype_table[de->file_type]; if (!dir_emit(ctx, de->name, de->name_len, le64_to_cpu(de->inode), - d_type)) { + fs_ftype_to_dtype(de->file_type))) { brelse(bh); return 0; } diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index 7071ad0dec90..daf836e5df43 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h @@ -424,17 +424,6 @@ static struct ocfs2_system_inode_info ocfs2_system_inodes[NUM_SYSTEM_INODES] = { #define OCFS2_LINKS_HI_SHIFT 16 #define OCFS2_DX_ENTRIES_MAX (0xffffffffU) -#define S_SHIFT 12 -static unsigned char ocfs2_type_by_mode[S_IFMT >> S_SHIFT] = { - [S_IFREG >> S_SHIFT] = OCFS2_FT_REG_FILE, - [S_IFDIR >> S_SHIFT] = OCFS2_FT_DIR, - [S_IFCHR >> S_SHIFT] = OCFS2_FT_CHRDEV, - [S_IFBLK >> S_SHIFT] = OCFS2_FT_BLKDEV, - [S_IFIFO >> S_SHIFT] = OCFS2_FT_FIFO, - [S_IFSOCK >> S_SHIFT] = OCFS2_FT_SOCK, - [S_IFLNK >> S_SHIFT] = OCFS2_FT_SYMLINK, -}; - /* * Convenience casts @@ -1629,7 +1618,21 @@ static inline int ocfs2_sprintf_system_inode_name(char *buf, int len, static inline void ocfs2_set_de_type(struct ocfs2_dir_entry *de, umode_t mode) { - de->file_type = ocfs2_type_by_mode[(mode & S_IFMT)>>S_SHIFT]; + /* + * compile-time asserts that generic FT_x types still match + * OCFS2_FT_x types + */ + BUILD_BUG_ON(OCFS2_FT_UNKNOWN != FT_UNKNOWN); + BUILD_BUG_ON(OCFS2_FT_REG_FILE != FT_REG_FILE); + BUILD_BUG_ON(OCFS2_FT_DIR != FT_DIR); + BUILD_BUG_ON(OCFS2_FT_CHRDEV != FT_CHRDEV); + BUILD_BUG_ON(OCFS2_FT_BLKDEV != FT_BLKDEV); + BUILD_BUG_ON(OCFS2_FT_FIFO != FT_FIFO); + BUILD_BUG_ON(OCFS2_FT_SOCK != FT_SOCK); + BUILD_BUG_ON(OCFS2_FT_SYMLINK != FT_SYMLINK); + BUILD_BUG_ON(OCFS2_FT_MAX != FT_MAX); + + de->file_type = fs_umode_to_ftype(mode); } static inline int ocfs2_gd_is_discontig(struct ocfs2_group_desc *gd)