f2fs: use common implementation of file type
PATCH 1/1 f2fs: use common implementation of file type
Use common implementation of file type conversion helpers.
Signed-off-by Weizhao Ouyang <[email protected]>
--- fs/f2fs/dir.c | 39 +++------------------------------------ fs/f2fs/f2fs.h | 1 - fs/f2fs/inline.c | 2 +- include/linux/f2fs_fs.h | 15 --------------- 4 files changed, 4 insertions(+), 53 deletions(-)
fs/f2fs/dir.c +3 -36
@@ -42,39 +42,6 @@ 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 ]; -} - -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 ; -} -/* If @dir is casefolded, initialize @fname->cf_name from @fname->usr_fname. */ int f2fs_init_casefolded_name (const struct inode *dir,struct f2fs_filename *fname)
@@ -485,7 +452,7 @@ void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de,lock_page (page);f2fs_wait_on_page_writeback (page, type, true, true); de->ino =cpu_to_le32 (inode->i_ino); -set_de_type (de, inode->i_mode); + de->file_type =fs_umode_to_ftype (inode->i_mode);set_page_dirty (page); dir->i_mtime = dir->i_ctime =current_time (dir);
@@ -699,7 +666,7 @@ void f2fs_update_dentry(nid_t ino, umode_t mode, struct f2fs_dentry_ptr *d, de->name_len =cpu_to_le16 (name->len);memcpy (d->filename[bit_pos], name->name, name->len); de->ino =cpu_to_le32 (ino); -set_de_type (de, mode); + de->file_type =fs_umode_to_ftype (mode);for (i =0 ; i < slots; i++) {__set_bit_le (bit_pos + i, (void *)d->bitmap);/* avoid wrong garbage data for readdir */
@@ -1036,7 +1003,7 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,continue ; } - d_type =f2fs_get_de_type (de); + d_type =fs_ftype_to_dtype (de->file_type); de_name.name = d->filename[bit_pos]; de_name.len =le16_to_cpu (de->name_len);
fs/f2fs/f2fs.h +0 -1
@@ -3489,7 +3489,6 @@ int f2fs_get_tmpfile(struct mnt_idmap *idmap, struct inode *dir,/* * dir.c */ -unsigned char f2fs_get_de_type (struct f2fs_dir_entry *de);int f2fs_init_casefolded_name (const struct inode *dir,struct f2fs_filename *fname); int f2fs_setup_filename(struct inode *dir, const struct qstr *iname,
fs/f2fs/inline.c +1 -1
@@ -497,7 +497,7 @@ static int f2fs_add_inline_entries(struct inode *dir, void *inline_dentry) fname.hash = de->hash_code; ino =le32_to_cpu (de->ino); - fake_mode =f2fs_get_de_type (de) <<S_SHIFT ; + fake_mode =fs_ftype_to_dtype (de->file_type) <<S_DT_SHIFT ; err =f2fs_add_regular_entry (dir, &fname,NULL , ino, fake_mode);if (err)
include/linux/f2fs_fs.h +0 -15
@@ -585,21 +585,6 @@ struct f2fs_dentry_block { __u8 filename[NR_DENTRY_IN_BLOCK][F2FS_SLOT_LEN]; } __packed; -/* file types used in inode_info->flags */ -enum { -F2FS_FT_UNKNOWN , -F2FS_FT_REG_FILE , -F2FS_FT_DIR , -F2FS_FT_CHRDEV , -F2FS_FT_BLKDEV , -F2FS_FT_FIFO , -F2FS_FT_SOCK , -F2FS_FT_SYMLINK , -F2FS_FT_MAX -}; - -#define S_SHIFT 12 -#define F2FS_DEF_PROJID 0/* default project ID */ #endif /* _LINUX_F2FS_FS_H */
Signature · 1 line
2.25.1
Quoted 3 lines · Weizhao Ouyang
Use common implementation of file type conversion helpers.
Signed-off-by Weizhao Ouyang <[email protected]>
Reviewed-by Chao Yu <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 9 lines · On Tue, 4 Apr 2023 11:28:44 +0800 you wrote:
Use common implementation of file type conversion helpers.
Signed-off-by Weizhao Ouyang <[email protected]>--- fs/f2fs/dir.c | 39 +++------------------------------------ fs/f2fs/f2fs.h | 1 - fs/f2fs/inline.c | 2 +- include/linux/f2fs_fs.h | 15 --------------- 4 files changed, 4 insertions(+), 53 deletions(-)
Here is the summary with links:
- [f2fs-dev] f2fs: use common implementation of file type
https://git.kernel.org/jaegeuk/f2fs/c/0c9f4521958f
You are awesome, thank you!
Signature · 10 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel