aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/btree.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nilfs2/btree.c')
-rw-r--r--fs/nilfs2/btree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index 102e218b426f..61e70d719b4d 100644
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -1026,7 +1026,7 @@ static int nilfs_btree_prepare_insert(struct nilfs_btree *btree,
1026 &path[level].bp_newreq); 1026 &path[level].bp_newreq);
1027 err_out_child_node: 1027 err_out_child_node:
1028 for (level--; level > NILFS_BTREE_LEVEL_DATA; level--) { 1028 for (level--; level > NILFS_BTREE_LEVEL_DATA; level--) {
1029 nilfs_bmap_delete_block(&btree->bt_bmap, path[level].bp_sib_bh); 1029 nilfs_btnode_delete(path[level].bp_sib_bh);
1030 btree->bt_bmap.b_pops->bpop_abort_alloc_ptr( 1030 btree->bt_bmap.b_pops->bpop_abort_alloc_ptr(
1031 &btree->bt_bmap, &path[level].bp_newreq); 1031 &btree->bt_bmap, &path[level].bp_newreq);
1032 1032
@@ -1220,7 +1220,7 @@ static void nilfs_btree_concat_left(struct nilfs_btree *btree,
1220 unlock_buffer(path[level].bp_bh); 1220 unlock_buffer(path[level].bp_bh);
1221 unlock_buffer(path[level].bp_sib_bh); 1221 unlock_buffer(path[level].bp_sib_bh);
1222 1222
1223 nilfs_bmap_delete_block(&btree->bt_bmap, path[level].bp_bh); 1223 nilfs_btnode_delete(path[level].bp_bh);
1224 path[level].bp_bh = path[level].bp_sib_bh; 1224 path[level].bp_bh = path[level].bp_sib_bh;
1225 path[level].bp_sib_bh = NULL; 1225 path[level].bp_sib_bh = NULL;
1226 path[level].bp_index += nilfs_btree_node_get_nchildren(btree, left); 1226 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,
1251 unlock_buffer(path[level].bp_bh); 1251 unlock_buffer(path[level].bp_bh);
1252 unlock_buffer(path[level].bp_sib_bh); 1252 unlock_buffer(path[level].bp_sib_bh);
1253 1253
1254 nilfs_bmap_delete_block(&btree->bt_bmap, path[level].bp_sib_bh); 1254 nilfs_btnode_delete(path[level].bp_sib_bh);
1255 path[level].bp_sib_bh = NULL; 1255 path[level].bp_sib_bh = NULL;
1256 path[level + 1].bp_index++; 1256 path[level + 1].bp_index++;
1257} 1257}
@@ -1275,7 +1275,7 @@ static void nilfs_btree_shrink(struct nilfs_btree *btree,
1275 nilfs_btree_node_move_left(btree, root, child, n); 1275 nilfs_btree_node_move_left(btree, root, child, n);
1276 unlock_buffer(path[level].bp_bh); 1276 unlock_buffer(path[level].bp_bh);
1277 1277
1278 nilfs_bmap_delete_block(&btree->bt_bmap, path[level].bp_bh); 1278 nilfs_btnode_delete(path[level].bp_bh);
1279 path[level].bp_bh = NULL; 1279 path[level].bp_bh = NULL;
1280} 1280}
1281 1281