nilfs2: remove pointless NULL check of bpop_commit_alloc_ptr function

This indirect function is set to NULL only for gc cache inodes, but
the gc cache inodes never call this function.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>

diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 63ee35080fbcb9c76b55c411bf826e8a0094c5d2..5b2606a0ac4860cec75f5b278ca5ab0e50e62d37 100644 (file)
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -1067,10 +1067,8 @@ static void nilfs_btree_commit_insert(struct nilfs_btree *btree,
                btree->bt_ops->btop_set_target(btree, key, ptr);
 
        for (level = NILFS_BTREE_LEVEL_NODE_MIN; level <= maxlevel; level++) {
-               if (btree->bt_bmap.b_pops->bpop_commit_alloc_ptr != NULL) {
-                       btree->bt_bmap.b_pops->bpop_commit_alloc_ptr(
-                               &btree->bt_bmap, &path[level - 1].bp_newreq);
-               }
+               btree->bt_bmap.b_pops->bpop_commit_alloc_ptr(
+                       &btree->bt_bmap, &path[level - 1].bp_newreq);
                path[level].bp_op(btree, path, level, &key, &ptr);
        }
 
@@ -1656,10 +1654,8 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *bmap,
        btree = (struct nilfs_btree *)bmap;
        nilfs_btree_init(bmap, low, high);
        if (nreq != NULL) {
-               if (bmap->b_pops->bpop_commit_alloc_ptr != NULL) {
-                       bmap->b_pops->bpop_commit_alloc_ptr(bmap, dreq);
-                       bmap->b_pops->bpop_commit_alloc_ptr(bmap, nreq);
-               }
+               bmap->b_pops->bpop_commit_alloc_ptr(bmap, dreq);
+               bmap->b_pops->bpop_commit_alloc_ptr(bmap, nreq);
 
                /* create child node at level 1 */
                lock_buffer(bh);
@@ -1681,8 +1677,7 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *bmap,
                nilfs_btree_node_init(btree, node, NILFS_BTREE_NODE_ROOT,
                                      2, 1, &keys[0], &tmpptr);
        } else {
-               if (bmap->b_pops->bpop_commit_alloc_ptr != NULL)
-                       bmap->b_pops->bpop_commit_alloc_ptr(bmap, dreq);
+               bmap->b_pops->bpop_commit_alloc_ptr(bmap, dreq);
 
                /* create root node at level 1 */
                node = nilfs_btree_get_root(btree);

diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c
index 5cbba8284bea95a4e0f716c35b74b20e1590a54e..eaeccb068b5e9f67359dc8dc7550c56c14f27c0f 100644 (file)
--- a/fs/nilfs2/direct.c
+++ b/fs/nilfs2/direct.c
@@ -111,9 +111,7 @@ static void nilfs_direct_commit_insert(struct nilfs_direct *direct,
        bh = (struct buffer_head *)((unsigned long)ptr);
        set_buffer_nilfs_volatile(bh);
 
-       if (direct->d_bmap.b_pops->bpop_commit_alloc_ptr != NULL)
-               direct->d_bmap.b_pops->bpop_commit_alloc_ptr(
-                       &direct->d_bmap, req);
+       direct->d_bmap.b_pops->bpop_commit_alloc_ptr(&direct->d_bmap, req);
        nilfs_direct_set_ptr(direct, key, req->bpr_ptr);
 
        if (!nilfs_bmap_dirty(&direct->d_bmap))