f2fs: split make_dentry_ptr() into block and inline versions

Since callers statically know which type to use, make_dentry_ptr()
can simply be splitted into two inline functions. This way, the code
has less inlined, fewer arguments, and no cast.

Signed-off-by: Tomohiro Kusumi <tkusumi@tuxera.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 058c4f3afcef9e1a2735257f03ca83d2d5df4538..c143dffcae6ea2ad9021e43c85902fdb116defda 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -94,7 +94,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(NULL, &d, (void *)dentry_blk, 1);
+       make_dentry_ptr_block(NULL, &d, dentry_blk);
        de = find_target_dentry(fname, namehash, max_slots, &d);
        if (de)
                *res_page = dentry_page;
@@ -366,7 +366,7 @@ static int make_empty_dir(struct inode *inode,
 
        dentry_blk = kmap_atomic(dentry_page);
 
-       make_dentry_ptr(NULL, &d, (void *)dentry_blk, 1);
+       make_dentry_ptr_block(NULL, &d, dentry_blk);
        do_make_empty_dir(inode, parent, &d);
 
        kunmap_atomic(dentry_blk);
@@ -586,7 +586,7 @@ add_dentry:
                }
        }
 
-       make_dentry_ptr(NULL, &d, (void *)dentry_blk, 1);
+       make_dentry_ptr_block(NULL, &d, dentry_blk);
        f2fs_update_dentry(ino, mode, &d, new_name, dentry_hash, bit_pos);
 
        set_page_dirty(dentry_page);
@@ -894,7 +894,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx)
 
                dentry_blk = kmap(dentry_page);
 
-               make_dentry_ptr(inode, &d, (void *)dentry_blk, 1);
+               make_dentry_ptr_block(inode, &d, dentry_blk);
 
                err = f2fs_fill_dentries(ctx, &d,
                                n * NR_DENTRY_IN_BLOCK, &fstr);

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 32821ff8483741d83a818e512dd8a40830d7b0f9..7b2b402389116735f340db037f17716e1a6820cb 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -328,26 +328,24 @@ struct f2fs_dentry_ptr {
        int max;
 };
 
-static inline void make_dentry_ptr(struct inode *inode,
-               struct f2fs_dentry_ptr *d, void *src, int type)
+static inline void make_dentry_ptr_block(struct inode *inode,
+               struct f2fs_dentry_ptr *d, struct f2fs_dentry_block *t)
 {
        d->inode = inode;
+       d->max = NR_DENTRY_IN_BLOCK;
+       d->bitmap = &t->dentry_bitmap;
+       d->dentry = t->dentry;
+       d->filename = t->filename;
+}
 
-       if (type == 1) {
-               struct f2fs_dentry_block *t = (struct f2fs_dentry_block *)src;
-
-               d->max = NR_DENTRY_IN_BLOCK;
-               d->bitmap = &t->dentry_bitmap;
-               d->dentry = t->dentry;
-               d->filename = t->filename;
-       } else {
-               struct f2fs_inline_dentry *t = (struct f2fs_inline_dentry *)src;
-
-               d->max = NR_INLINE_DENTRY;
-               d->bitmap = &t->dentry_bitmap;
-               d->dentry = t->dentry;
-               d->filename = t->filename;
-       }
+static inline void make_dentry_ptr_inline(struct inode *inode,
+               struct f2fs_dentry_ptr *d, struct f2fs_inline_dentry *t)
+{
+       d->inode = inode;
+       d->max = NR_INLINE_DENTRY;
+       d->bitmap = &t->dentry_bitmap;
+       d->dentry = t->dentry;
+       d->filename = t->filename;
 }
 
 /*

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 031c3d78cbc61da8535261c6e9fe90e54ebf5eb6..0ccdefe9fdbab85d83d09816792ff12c25f56756 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -302,7 +302,7 @@ struct f2fs_dir_entry *find_in_inline_dir(struct inode *dir,
 
        inline_dentry = inline_data_addr(ipage);
 
-       make_dentry_ptr(NULL, &d, (void *)inline_dentry, 2);
+       make_dentry_ptr_inline(NULL, &d, inline_dentry);
        de = find_target_dentry(fname, namehash, NULL, &d);
        unlock_page(ipage);
        if (de)
@@ -321,7 +321,7 @@ int make_empty_inline_dir(struct inode *inode, struct inode *parent,
 
        dentry_blk = inline_data_addr(ipage);
 
-       make_dentry_ptr(NULL, &d, (void *)dentry_blk, 2);
+       make_dentry_ptr_inline(NULL, &d, dentry_blk);
        do_make_empty_dir(inode, parent, &d);
 
        set_page_dirty(ipage);
@@ -402,7 +402,7 @@ static int f2fs_add_inline_entries(struct inode *dir,
        unsigned long bit_pos = 0;
        int err = 0;
 
-       make_dentry_ptr(NULL, &d, (void *)inline_dentry, 2);
+       make_dentry_ptr_inline(NULL, &d, inline_dentry);
 
        while (bit_pos < d.max) {
                struct f2fs_dir_entry *de;
@@ -534,7 +534,7 @@ int f2fs_add_inline_entry(struct inode *dir, const struct qstr *new_name,
        f2fs_wait_on_page_writeback(ipage, NODE, true);
 
        name_hash = f2fs_dentry_hash(new_name);
-       make_dentry_ptr(NULL, &d, (void *)dentry_blk, 2);
+       make_dentry_ptr_inline(NULL, &d, dentry_blk);
        f2fs_update_dentry(ino, mode, &d, new_name, name_hash, bit_pos);
 
        set_page_dirty(ipage);
@@ -623,7 +623,7 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,
 
        inline_dentry = inline_data_addr(ipage);
 
-       make_dentry_ptr(inode, &d, (void *)inline_dentry, 2);
+       make_dentry_ptr_inline(inode, &d, inline_dentry);
 
        err = f2fs_fill_dentries(ctx, &d, 0, fstr);
        if (!err)