f2fs: use common file type conversion
Subsystems (2)
RFC PATCH v2 8/10 f2fs: use common file type conversion
Deduplicate the f2fs file type conversion implementation.
Original patch by Amir Goldstein.
v2:
- Rebased against Linux 4.19 by Phillip Potter
- Compile-time checks added by Phillip Potter to make sure the F2FS_FT_x enum values stay same as FT_x values
v1:
- Initial implementation
Signed-off-by Phillip Potter <[email protected]>
--- fs/f2fs/dir.c | 43 +++++++++++++++++------------------------ fs/f2fs/inline.c | 2 +- include/linux/f2fs_fs.h | 8 +++++--- 3 files changed, 24 insertions(+), 29 deletions(-)
fs/f2fs/dir.c +18 -25
@@ -39,37 +39,30 @@ 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 , -}; -static void set_de_type (struct f2fs_dir_entry *de,umode_t mode) { - de->file_type = f2fs_type_by_mode[(mode &S_IFMT ) >>S_SHIFT ]; +/* +* compile-time asserts that generic FT_x types +* still match F2FS_FT_x types - no need to list +* in other functions as well as build will +* fail either way +*/ +BUILD_BUG_ON (F2FS_FT_UNKNOWN !=FT_UNKNOWN ); +BUILD_BUG_ON (F2FS_FT_REG_FILE !=FT_REG_FILE ); +BUILD_BUG_ON (F2FS_FT_DIR !=FT_DIR ); +BUILD_BUG_ON (F2FS_FT_CHRDEV !=FT_CHRDEV ); +BUILD_BUG_ON (F2FS_FT_BLKDEV !=FT_BLKDEV ); +BUILD_BUG_ON (F2FS_FT_FIFO !=FT_FIFO ); +BUILD_BUG_ON (F2FS_FT_SOCK !=FT_SOCK ); +BUILD_BUG_ON (F2FS_FT_SYMLINK !=FT_SYMLINK ); +BUILD_BUG_ON (F2FS_FT_MAX !=FT_MAX ); + + de->file_type =fs_umode_to_ftype (mode); }unsigned char f2fs_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,
fs/f2fs/inline.c +1 -1
@@ -460,7 +460,7 @@ static int f2fs_add_inline_entries(struct inode *dir, void *inline_dentry) new_name.len =le16_to_cpu (de->name_len); ino =le32_to_cpu (de->ino); - fake_mode =f2fs_get_de_type (de) <<S_SHIFT ; + fake_mode =f2fs_get_de_type (de) <<S_DT_SHIFT ; err =f2fs_add_regular_entry (dir, &new_name,NULL ,NULL , ino, fake_mode);
include/linux/f2fs_fs.h +5 -3
@@ -524,7 +524,11 @@ struct f2fs_dentry_block {__u8 filename[NR_DENTRY_IN_BLOCK ][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 ,
@@ -537,8 +541,6 @@ enum {F2FS_FT_MAX }; -#define S_SHIFT 12 -#define F2FS_DEF_PROJID 0/* default project ID */ #endif /* _LINUX_F2FS_FS_H */
Signature · 1 line
2.17.2