From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wj0-f194.google.com ([209.85.210.194]:33160 "EHLO mail-wj0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755719AbcLSULv (ORCPT ); Mon, 19 Dec 2016 15:11:51 -0500 Received: by mail-wj0-f194.google.com with SMTP id kp2so25053989wjc.0 for ; Mon, 19 Dec 2016 12:11:50 -0800 (PST) From: Amir Goldstein To: Jan Kara , Theodore Ts'o , Dave Chinner Cc: "Darrick J . Wong" , Chris Mason , Boaz Harrosh , Jaegeuk Kim , Ryusuke Konishi , Mark Fasheh , Evgeniy Dushistov , Miklos Szeredi , Al Viro , linux-fsdevel@vger.kernel.org Subject: [RFC][PATCH 08/11] f2fs: use common file type conversion Date: Mon, 19 Dec 2016 22:11:05 +0200 Message-Id: <1482178268-22883-9-git-send-email-amir73il@gmail.com> In-Reply-To: <1482178268-22883-1-git-send-email-amir73il@gmail.com> References: <1482178268-22883-1-git-send-email-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: deduplicate the f2fs file type conversion implementation. Signed-off-by: Amir Goldstein --- fs/f2fs/dir.c | 27 ++------------------------- fs/f2fs/inline.c | 2 +- include/linux/f2fs_fs.h | 8 +++++--- 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 827c5da..31bbad1 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -37,37 +37,14 @@ static unsigned int bucket_blocks(unsigned int level) return 4; } -static unsigned char f2fs_filetype_table[F2FS_FT_MAX] = { - [F2FS_FT_UNKNOWN] = DT_UNKNOWN, - [F2FS_FT_REG_FILE] = DT_REG, - [F2FS_FT_DIR] = DT_DIR, - [F2FS_FT_CHRDEV] = DT_CHR, - [F2FS_FT_BLKDEV] = DT_BLK, - [F2FS_FT_FIFO] = DT_FIFO, - [F2FS_FT_SOCK] = DT_SOCK, - [F2FS_FT_SYMLINK] = DT_LNK, -}; - -static unsigned char f2fs_type_by_mode[S_IFMT >> S_SHIFT] = { - [S_IFREG >> S_SHIFT] = F2FS_FT_REG_FILE, - [S_IFDIR >> S_SHIFT] = F2FS_FT_DIR, - [S_IFCHR >> S_SHIFT] = F2FS_FT_CHRDEV, - [S_IFBLK >> S_SHIFT] = F2FS_FT_BLKDEV, - [S_IFIFO >> S_SHIFT] = F2FS_FT_FIFO, - [S_IFSOCK >> S_SHIFT] = F2FS_FT_SOCK, - [S_IFLNK >> S_SHIFT] = F2FS_FT_SYMLINK, -}; - void set_de_type(struct f2fs_dir_entry *de, umode_t mode) { - de->file_type = f2fs_type_by_mode[(mode & S_IFMT) >> S_SHIFT]; + de->file_type = fs_umode_to_ftype(mode); } unsigned char get_de_type(struct f2fs_dir_entry *de) { - if (de->file_type < F2FS_FT_MAX) - return f2fs_filetype_table[de->file_type]; - return DT_UNKNOWN; + return fs_dtype(de->file_type); } static unsigned long dir_block_index(unsigned int level, diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index e32a9e5..53148d6 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -424,7 +424,7 @@ static int f2fs_add_inline_entries(struct inode *dir, new_name.len = le16_to_cpu(de->name_len); ino = le32_to_cpu(de->ino); - fake_mode = get_de_type(de) << S_SHIFT; + fake_mode = get_de_type(de) << S_DT_SHIFT; err = f2fs_add_regular_entry(dir, &new_name, NULL, NULL, ino, fake_mode); diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h index cea41a1..3bfa4e2 100644 --- a/include/linux/f2fs_fs.h +++ b/include/linux/f2fs_fs.h @@ -504,7 +504,11 @@ struct f2fs_inline_dentry { __u8 filename[NR_INLINE_DENTRY][F2FS_SLOT_LEN]; } __packed; -/* file types used in inode_info->flags */ +/* + * file types used in inode_info->flags + * + * Values should match common file type values in file_type.h. + */ enum { F2FS_FT_UNKNOWN, F2FS_FT_REG_FILE, @@ -517,6 +521,4 @@ enum { F2FS_FT_MAX }; -#define S_SHIFT 12 - #endif /* _LINUX_F2FS_FS_H */ -- 2.7.4