Commit 9f098900 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: remove nilfs_bmap_delete_block 



nilfs_bmap_delete_block() is a wrapper function calling
nilfs_btnode_delete().  This removes it for simplicity.

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 087d01b4

fs/nilfs2/bmap.c

+0 −6
Original line number Diff line number Diff line
@@ -437,12 +437,6 @@ int nilfs_bmap_get_new_block(const struct nilfs_bmap *bmap, __u64 ptr, 
	return 0;

}



void nilfs_bmap_delete_block(const struct nilfs_bmap *bmap,

			     struct buffer_head *bh)

{

	nilfs_btnode_delete(bh);

}



__u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap,

			      const struct buffer_head *bh)

{

fs/nilfs2/bmap.h

+0 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ int nilfs_bmap_get_block(const struct nilfs_bmap *, __u64, 
			 struct buffer_head **);

int nilfs_bmap_get_new_block(const struct nilfs_bmap *, __u64,

			     struct buffer_head **);

void nilfs_bmap_delete_block(const struct nilfs_bmap *, struct buffer_head *);





/* Assume that bmap semaphore is locked. */

fs/nilfs2/btree.c

+4 −4
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ static int nilfs_btree_prepare_insert(struct nilfs_btree *btree, 
						    &path[level].bp_newreq);

 err_out_child_node:

	for (level--; level > NILFS_BTREE_LEVEL_DATA; level--) {

		nilfs_bmap_delete_block(&btree->bt_bmap, path[level].bp_sib_bh);

		nilfs_btnode_delete(path[level].bp_sib_bh);

		btree->bt_bmap.b_pops->bpop_abort_alloc_ptr(

			&btree->bt_bmap, &path[level].bp_newreq);
@@ -1220,7 +1220,7 @@ static void nilfs_btree_concat_left(struct nilfs_btree *btree, 
	unlock_buffer(path[level].bp_bh);

	unlock_buffer(path[level].bp_sib_bh);



	nilfs_bmap_delete_block(&btree->bt_bmap, path[level].bp_bh);

	nilfs_btnode_delete(path[level].bp_bh);

	path[level].bp_bh = path[level].bp_sib_bh;

	path[level].bp_sib_bh = NULL;

	path[level].bp_index += nilfs_btree_node_get_nchildren(btree, left);
@@ -1251,7 +1251,7 @@ static void nilfs_btree_concat_right(struct nilfs_btree *btree, 
	unlock_buffer(path[level].bp_bh);

	unlock_buffer(path[level].bp_sib_bh);



	nilfs_bmap_delete_block(&btree->bt_bmap, path[level].bp_sib_bh);

	nilfs_btnode_delete(path[level].bp_sib_bh);

	path[level].bp_sib_bh = NULL;

	path[level + 1].bp_index++;

}
@@ -1275,7 +1275,7 @@ static void nilfs_btree_shrink(struct nilfs_btree *btree, 
	nilfs_btree_node_move_left(btree, root, child, n);

	unlock_buffer(path[level].bp_bh);



	nilfs_bmap_delete_block(&btree->bt_bmap, path[level].bp_bh);

	nilfs_btnode_delete(path[level].bp_bh);

	path[level].bp_bh = NULL;

}