Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e473c1f2 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

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: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent f198dbb9

fs/nilfs2/btree.c

+5 −10
Original line number Diff line number Diff line
@@ -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);

		}

		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);

		}



		/* create child node at level 1 */

		lock_buffer(bh);
@@ -1681,7 +1677,6 @@ 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);



		/* create root node at level 1 */

fs/nilfs2/direct.c

+1 −3
Original line number Diff line number Diff line
@@ -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))