exofs: use common file type conversion
RFC PATCH v3 5/10 exofs: use common file type conversion
Deduplicate the exofs 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 <[email protected]>
Signed-off-by Phillip Potter <[email protected]>
--- fs/exofs/dir.c | 48 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 32 deletions(-)
fs/exofs/dir.c +16 -32
@@ -204,33 +204,24 @@ exofs_validate_entry(char *base, unsigned offset, unsigned mask)return (char *)p - base; } -static unsigned char exofs_filetype_table[EXOFS_FT_MAX ] = { - [EXOFS_FT_UNKNOWN ] =DT_UNKNOWN , - [EXOFS_FT_REG_FILE ] =DT_REG , - [EXOFS_FT_DIR ] =DT_DIR , - [EXOFS_FT_CHRDEV ] =DT_CHR , - [EXOFS_FT_BLKDEV ] =DT_BLK , - [EXOFS_FT_FIFO ] =DT_FIFO , - [EXOFS_FT_SOCK ] =DT_SOCK , - [EXOFS_FT_SYMLINK ] =DT_LNK , -}; - -#define S_SHIFT 12 -static unsigned char exofs_type_by_mode[S_IFMT >>S_SHIFT ] = { - [S_IFREG >>S_SHIFT ] =EXOFS_FT_REG_FILE , - [S_IFDIR >>S_SHIFT ] =EXOFS_FT_DIR , - [S_IFCHR >>S_SHIFT ] =EXOFS_FT_CHRDEV , - [S_IFBLK >>S_SHIFT ] =EXOFS_FT_BLKDEV , - [S_IFIFO >>S_SHIFT ] =EXOFS_FT_FIFO , - [S_IFSOCK >>S_SHIFT ] =EXOFS_FT_SOCK , - [S_IFLNK >>S_SHIFT ] =EXOFS_FT_SYMLINK , -}; -static inline void exofs_set_de_type (struct exofs_dir_entry *de,struct inode *inode) { -umode_t mode = inode->i_mode; - de->file_type = exofs_type_by_mode[(mode &S_IFMT ) >>S_SHIFT ]; +/* +* compile-time asserts that generic FT_x types still match +* EXOFS_FT_x types +*/ +BUILD_BUG_ON (EXOFS_FT_UNKNOWN !=FT_UNKNOWN ); +BUILD_BUG_ON (EXOFS_FT_REG_FILE !=FT_REG_FILE ); +BUILD_BUG_ON (EXOFS_FT_DIR !=FT_DIR ); +BUILD_BUG_ON (EXOFS_FT_CHRDEV !=FT_CHRDEV ); +BUILD_BUG_ON (EXOFS_FT_BLKDEV !=FT_BLKDEV ); +BUILD_BUG_ON (EXOFS_FT_FIFO !=FT_FIFO ); +BUILD_BUG_ON (EXOFS_FT_SOCK !=FT_SOCK ); +BUILD_BUG_ON (EXOFS_FT_SYMLINK !=FT_SYMLINK ); +BUILD_BUG_ON (EXOFS_FT_MAX !=FT_MAX ); + + de->file_type =fs_umode_to_ftype (inode->i_mode); } static int
@@ -280,16 +271,9 @@ exofs_readdir(struct file *file, struct dir_context *ctx)return -EIO ; }if (de->inode_no) { -unsigned char t; - -if (de->file_type <EXOFS_FT_MAX ) - t = exofs_filetype_table[de->file_type]; -else - t =DT_UNKNOWN ; -if (!dir_emit (ctx, de->name, de->name_len,le64_to_cpu (de->inode_no), - t)) { +fs_ftype_to_dtype (de->file_type))) {exofs_put_page (page);return 0 ; }
Signature · 1 line
2.17.2
Quoted 5 lines · Phillip Potter
Deduplicate the exofs 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.hand implemented infs_types.c
Quoted 78 lines
Signed-off-by Amir Goldstein <[email protected]>Signed-off-by Phillip Potter <[email protected]>--- fs/exofs/dir.c | 48 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 32 deletions(-)fs/exofs/dir.c +16
-32@@ -204,33 +204,24 @@ exofs_validate_entry(char *base, unsigned offset, unsigned mask)return (char *)p - base; } -static unsigned char exofs_filetype_table[EXOFS_FT_MAX ] = { - [EXOFS_FT_UNKNOWN ] =DT_UNKNOWN , - [EXOFS_FT_REG_FILE ] =DT_REG , - [EXOFS_FT_DIR ] =DT_DIR , - [EXOFS_FT_CHRDEV ] =DT_CHR , - [EXOFS_FT_BLKDEV ] =DT_BLK , - [EXOFS_FT_FIFO ] =DT_FIFO , - [EXOFS_FT_SOCK ] =DT_SOCK , - [EXOFS_FT_SYMLINK ] =DT_LNK , -}; - -#define S_SHIFT 12 -static unsigned char exofs_type_by_mode[S_IFMT >>S_SHIFT ] = { - [S_IFREG >>S_SHIFT ] =EXOFS_FT_REG_FILE , - [S_IFDIR >>S_SHIFT ] =EXOFS_FT_DIR , - [S_IFCHR >>S_SHIFT ] =EXOFS_FT_CHRDEV , - [S_IFBLK >>S_SHIFT ] =EXOFS_FT_BLKDEV , - [S_IFIFO >>S_SHIFT ] =EXOFS_FT_FIFO , - [S_IFSOCK >>S_SHIFT ] =EXOFS_FT_SOCK , - [S_IFLNK >>S_SHIFT ] =EXOFS_FT_SYMLINK , -}; -static inline void exofs_set_de_type (struct exofs_dir_entry *de,struct inode *inode) { -umode_t mode = inode->i_mode; - de->file_type = exofs_type_by_mode[(mode &S_IFMT ) >>S_SHIFT ]; +/* +* compile-time asserts that generic FT_x types still match +* EXOFS_FT_x types +*/ +BUILD_BUG_ON (EXOFS_FT_UNKNOWN !=FT_UNKNOWN ); +BUILD_BUG_ON (EXOFS_FT_REG_FILE !=FT_REG_FILE ); +BUILD_BUG_ON (EXOFS_FT_DIR !=FT_DIR ); +BUILD_BUG_ON (EXOFS_FT_CHRDEV !=FT_CHRDEV ); +BUILD_BUG_ON (EXOFS_FT_BLKDEV !=FT_BLKDEV ); +BUILD_BUG_ON (EXOFS_FT_FIFO !=FT_FIFO ); +BUILD_BUG_ON (EXOFS_FT_SOCK !=FT_SOCK ); +BUILD_BUG_ON (EXOFS_FT_SYMLINK !=FT_SYMLINK ); +BUILD_BUG_ON (EXOFS_FT_MAX !=FT_MAX ); + + de->file_type =fs_umode_to_ftype (inode->i_mode); } static int@@ -280,16 +271,9 @@ exofs_readdir(struct file *file, struct dir_context *ctx)return -EIO ; }if (de->inode_no) { -unsigned char t; - -if (de->file_type <EXOFS_FT_MAX ) - t = exofs_filetype_table[de->file_type]; -else - t =DT_UNKNOWN ; -if (!dir_emit (ctx, de->name, de->name_len,le64_to_cpu (de->inode_no), - t)) { +fs_ftype_to_dtype (de->file_type))) {exofs_put_page (page);return 0 ; }