f2fs:use enum dentrt_ptr type to replace constant use
Subsystems (2)
PATCH 3/3 f2fs:use enum dentrt_ptr type to replace constant use
The function make_dentry_ptr has an argument 'int type'. This argument is used to distinguish 'block dentry' and 'inline dentry'. We used 1 and 2 as the type. To make code more readable, we use enum type to replace constant use.
--- fs/f2fs/dir.c | 8 ++++---- fs/f2fs/f2fs.h | 8 +++++++- fs/f2fs/inline.c | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-)
fs/f2fs/dir.c +4 -4
@@ -99,7 +99,7 @@ static struct f2fs_dir_entry *find_in_block(struct page *dentry_page, dentry_blk = (struct f2fs_dentry_block *)kmap (dentry_page); -make_dentry_ptr (&d, (void *)dentry_blk,1 ); +make_dentry_ptr (&d, (void *)dentry_blk,DENTRY_PTR_TYPE_BLOCK ); de =find_target_dentry (name, max_slots, &d);if (de)
@@ -360,7 +360,7 @@ static int make_empty_dir(struct inode *inode, dentry_blk =kmap_atomic (dentry_page); -make_dentry_ptr (&d, (void *)dentry_blk,1 ); +make_dentry_ptr (&d, (void *)dentry_blk,DENTRY_PTR_TYPE_BLOCK );do_make_empty_dir (inode, parent, &d);kunmap_atomic (dentry_blk);
@@ -571,7 +571,7 @@ add_dentry: goto fail; } -make_dentry_ptr (&d, (void *)dentry_blk,1 ); +make_dentry_ptr (&d, (void *)dentry_blk,DENTRY_PTR_TYPE_BLOCK );f2fs_update_dentry (inode, &d, name, dentry_hash, bit_pos);set_page_dirty (dentry_page);
@@ -782,7 +782,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) dentry_blk =kmap (dentry_page); -make_dentry_ptr (&d, (void *)dentry_blk,1 ); +make_dentry_ptr (&d, (void *)dentry_blk,DENTRY_PTR_TYPE_BLOCK );if (f2fs_fill_dentries (ctx, &d, n *NR_DENTRY_IN_BLOCK )) goto stop;
fs/f2fs/f2fs.h +7 -1
@@ -236,10 +236,16 @@ struct f2fs_dentry_ptr {int max; }; +enum { +DENTRY_PTR_TYPE_BLOCK =1 , +DENTRY_PTR_TYPE_INLNE , +DENTRY_PTR_TYPE_MAX +}; +static inline void make_dentry_ptr (struct f2fs_dentry_ptr *d,void *src,int type) { -if (type ==1 ) { +if (type ==DENTRY_PTR_TYPE_BLOCK ) {struct f2fs_dentry_block *t = (struct f2fs_dentry_block *)src; d->max =NR_DENTRY_IN_BLOCK ; d->bitmap = &t->dentry_bitmap;
fs/f2fs/inline.c +4 -4
@@ -271,7 +271,7 @@ struct f2fs_dir_entry *find_in_inline_dir(struct inode *dir, inline_dentry =inline_data_addr (ipage); -make_dentry_ptr (&d, (void *)inline_dentry,2 ); +make_dentry_ptr (&d, (void *)inline_dentry,DENTRY_PTR_TYPE_INLNE ); de =find_target_dentry (name,NULL , &d);unlock_page (ipage);
@@ -315,7 +315,7 @@ int make_empty_inline_dir(struct inode *inode, struct inode *parent, dentry_blk =inline_data_addr (ipage); -make_dentry_ptr (&d, (void *)dentry_blk,2 ); +make_dentry_ptr (&d, (void *)dentry_blk,DENTRY_PTR_TYPE_INLNE );do_make_empty_dir (inode, parent, &d);set_page_dirty (ipage);
@@ -417,7 +417,7 @@ int f2fs_add_inline_entry(struct inode *dir, const struct qstr *name,f2fs_wait_on_page_writeback (ipage,NODE ); name_hash =f2fs_dentry_hash (name); -make_dentry_ptr (&d, (void *)dentry_blk,2 ); +make_dentry_ptr (&d, (void *)dentry_blk,DENTRY_PTR_TYPE_INLNE );f2fs_update_dentry (inode, &d, name, name_hash, bit_pos);set_page_dirty (ipage);
@@ -507,7 +507,7 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx) inline_dentry =inline_data_addr (ipage); -make_dentry_ptr (&d, (void *)inline_dentry,2 ); +make_dentry_ptr (&d, (void *)inline_dentry,DENTRY_PTR_TYPE_INLNE );if (!f2fs_fill_dentries (ctx, &d,0 )) ctx->pos =NR_INLINE_DENTRY ;
Signature · 1 line
1.7.9.5
Hi Yuan,
Quoted 66 lines
-----Original Message-----
From: Yuan Zhong [mailto:[email protected]]
Sent: Saturday, March 07, 2015 6:10 PM
To: Jaegeuk Kim
Cc: [email protected]; [email protected]; [email protected]
Subject: [f2fs-dev] [PATCH 3/3] f2fs:use enumdentrt_ptrtype to replace constant useThe function
make_dentry_ptrhas an argument 'int type'. This argument is used to distinguish 'block dentry' and 'inline dentry'. We used 1 and 2 as the type. To make code more readable, we use enum type to replace constant use.Signed-off-by Yuan Zhong <[email protected]>--- fs/f2fs/dir.c | 8 ++++---- fs/f2fs/f2fs.h | 8 +++++++- fs/f2fs/inline.c | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-)fs/f2fs/dir.c +4
-4@@ -99,7 +99,7 @@ static struct f2fs_dir_entry *find_in_block(struct page *dentry_page, dentry_blk = (struct f2fs_dentry_block *)kmap (dentry_page); -make_dentry_ptr (&d, (void *)dentry_blk,1 ); +make_dentry_ptr (&d, (void *)dentry_blk,DENTRY_PTR_TYPE_BLOCK ); de =find_target_dentry (name, max_slots, &d);if (de)@@ -360,7 +360,7 @@ static int make_empty_dir(struct inode *inode, dentry_blk =kmap_atomic (dentry_page); -make_dentry_ptr (&d, (void *)dentry_blk,1 ); +make_dentry_ptr (&d, (void *)dentry_blk,DENTRY_PTR_TYPE_BLOCK );do_make_empty_dir (inode, parent, &d);kunmap_atomic (dentry_blk);@@ -571,7 +571,7 @@ add_dentry: goto fail; } -make_dentry_ptr (&d, (void *)dentry_blk,1 ); +make_dentry_ptr (&d, (void *)dentry_blk,DENTRY_PTR_TYPE_BLOCK );f2fs_update_dentry (inode, &d, name, dentry_hash, bit_pos);set_page_dirty (dentry_page);@@ -782,7 +782,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) dentry_blk =kmap (dentry_page); -make_dentry_ptr (&d, (void *)dentry_blk,1 ); +make_dentry_ptr (&d, (void *)dentry_blk,DENTRY_PTR_TYPE_BLOCK );if (f2fs_fill_dentries (ctx, &d, n *NR_DENTRY_IN_BLOCK )) goto stop;fs/f2fs/f2fs.h +0
-0
fs/f2fs/f2fs.h struct f2fs_dentry_ptr { · line 243
Quoted 8 lines
fs/f2fs/f2fs.h +5
-0@@ -236,10 +236,16 @@ struct f2fs_dentry_ptr {int max; }; +enum { +DENTRY_PTR_TYPE_BLOCK =1 , +DENTRY_PTR_TYPE_INLNE , +DENTRY_PTR_TYPE_MAX +};
How do you think of using below enum?
enum dentry_type {
REGULAR_DENTRY = 1,
INLINE_DENTRY,
};