lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nilfs2: remove nilfs_bmap_put_block

Browse Source 
nilfs_bmap_put_block() is a wrapper function calling brelse().  This
eliminates the wrapper for simplicity.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
This commit is contained in:
Ryusuke Konishi
2009-05-22 00:33:13 +09:00
parent 654137dd46
commit 087d01b425
3 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nilfs2/bmap.c
View File

@@ -424,12 +424,6 @@ int nilfs_bmap_get_block(const struct nilfs_bmap *bmap, __u64 ptr,
ptr, 0, bhp, 0); ptr, 0, bhp, 0);
} }
void nilfs_bmap_put_block(const struct nilfs_bmap *bmap,
struct buffer_head *bh)
{
brelse(bh);
}
int nilfs_bmap_get_new_block(const struct nilfs_bmap *bmap, __u64 ptr, int nilfs_bmap_get_new_block(const struct nilfs_bmap *bmap, __u64 ptr,
struct buffer_head **bhp) struct buffer_head **bhp)
{ {

1
fs/nilfs2/bmap.h
View File

@@ -204,7 +204,6 @@ void nilfs_bmap_sub_blocks(const struct nilfs_bmap *, int);
int nilfs_bmap_get_block(const struct nilfs_bmap *, __u64, int nilfs_bmap_get_block(const struct nilfs_bmap *, __u64,
struct buffer_head **); struct buffer_head **);
void nilfs_bmap_put_block(const struct nilfs_bmap *, struct buffer_head *);
int nilfs_bmap_get_new_block(const struct nilfs_bmap *, __u64, int nilfs_bmap_get_new_block(const struct nilfs_bmap *, __u64,
struct buffer_head **); struct buffer_head **);
void nilfs_bmap_delete_block(const struct nilfs_bmap *, struct buffer_head *); void nilfs_bmap_delete_block(const struct nilfs_bmap *, struct buffer_head *);

33
fs/nilfs2/btree.c
View File

@@ -109,8 +109,7 @@ static void nilfs_btree_clear_path(const struct nilfs_btree *btree,
level < NILFS_BTREE_LEVEL_MAX; level < NILFS_BTREE_LEVEL_MAX;
level++) { level++) {
if (path[level].bp_bh != NULL) { if (path[level].bp_bh != NULL) {
nilfs_bmap_put_block(&btree->bt_bmap, brelse(path[level].bp_bh);
path[level].bp_bh);
path[level].bp_bh = NULL; path[level].bp_bh = NULL;
} }
/* sib_bh is released or deleted by prepare or commit /* sib_bh is released or deleted by prepare or commit
@@ -669,13 +668,13 @@ static void nilfs_btree_carry_left(struct nilfs_btree *btree,
nilfs_btree_node_get_key(btree, node, 0)); nilfs_btree_node_get_key(btree, node, 0));
if (move) { if (move) {
nilfs_bmap_put_block(&btree->bt_bmap, path[level].bp_bh); brelse(path[level].bp_bh);
path[level].bp_bh = path[level].bp_sib_bh; path[level].bp_bh = path[level].bp_sib_bh;
path[level].bp_sib_bh = NULL; path[level].bp_sib_bh = NULL;
path[level].bp_index += lnchildren; path[level].bp_index += lnchildren;
path[level + 1].bp_index--; path[level + 1].bp_index--;
} else { } else {
nilfs_bmap_put_block(&btree->bt_bmap, path[level].bp_sib_bh); brelse(path[level].bp_sib_bh);
path[level].bp_sib_bh = NULL; path[level].bp_sib_bh = NULL;
path[level].bp_index -= n; path[level].bp_index -= n;
} }
@@ -722,14 +721,14 @@ static void nilfs_btree_carry_right(struct nilfs_btree *btree,
path[level + 1].bp_index--; path[level + 1].bp_index--;
if (move) { if (move) {
nilfs_bmap_put_block(&btree->bt_bmap, path[level].bp_bh); brelse(path[level].bp_bh);
path[level].bp_bh = path[level].bp_sib_bh; path[level].bp_bh = path[level].bp_sib_bh;
path[level].bp_sib_bh = NULL; path[level].bp_sib_bh = NULL;
path[level].bp_index -= path[level].bp_index -=
nilfs_btree_node_get_nchildren(btree, node); nilfs_btree_node_get_nchildren(btree, node);
path[level + 1].bp_index++; path[level + 1].bp_index++;
} else { } else {
nilfs_bmap_put_block(&btree->bt_bmap, path[level].bp_sib_bh); brelse(path[level].bp_sib_bh);
path[level].bp_sib_bh = NULL; path[level].bp_sib_bh = NULL;
} }
@@ -781,7 +780,7 @@ static void nilfs_btree_split(struct nilfs_btree *btree,
*keyp = nilfs_btree_node_get_key(btree, right, 0); *keyp = nilfs_btree_node_get_key(btree, right, 0);
*ptrp = path[level].bp_newreq.bpr_ptr; *ptrp = path[level].bp_newreq.bpr_ptr;
nilfs_bmap_put_block(&btree->bt_bmap, path[level].bp_bh); brelse(path[level].bp_bh);
path[level].bp_bh = path[level].bp_sib_bh; path[level].bp_bh = path[level].bp_sib_bh;
path[level].bp_sib_bh = NULL; path[level].bp_sib_bh = NULL;
} else { } else {
@@ -790,7 +789,7 @@ static void nilfs_btree_split(struct nilfs_btree *btree,
*keyp = nilfs_btree_node_get_key(btree, right, 0); *keyp = nilfs_btree_node_get_key(btree, right, 0);
*ptrp = path[level].bp_newreq.bpr_ptr; *ptrp = path[level].bp_newreq.bpr_ptr;
nilfs_bmap_put_block(&btree->bt_bmap, path[level].bp_sib_bh); brelse(path[level].bp_sib_bh);
path[level].bp_sib_bh = NULL; path[level].bp_sib_bh = NULL;
} }
@@ -936,7 +935,7 @@ static int nilfs_btree_prepare_insert(struct nilfs_btree *btree,
stats->bs_nblocks++; stats->bs_nblocks++;
goto out; goto out;
} else } else
nilfs_bmap_put_block(&btree->bt_bmap, bh); brelse(bh);
} }
/* right sibling */ /* right sibling */
@@ -956,7 +955,7 @@ static int nilfs_btree_prepare_insert(struct nilfs_btree *btree,
stats->bs_nblocks++; stats->bs_nblocks++;
goto out; goto out;
} else } else
nilfs_bmap_put_block(&btree->bt_bmap, bh); brelse(bh);
} }
/* split */ /* split */
@@ -1153,7 +1152,7 @@ static void nilfs_btree_borrow_left(struct nilfs_btree *btree,
nilfs_btree_promote_key(btree, path, level + 1, nilfs_btree_promote_key(btree, path, level + 1,
nilfs_btree_node_get_key(btree, node, 0)); nilfs_btree_node_get_key(btree, node, 0));
nilfs_bmap_put_block(&btree->bt_bmap, path[level].bp_sib_bh); brelse(path[level].bp_sib_bh);
path[level].bp_sib_bh = NULL; path[level].bp_sib_bh = NULL;
path[level].bp_index += n; path[level].bp_index += n;
} }
@@ -1192,7 +1191,7 @@ static void nilfs_btree_borrow_right(struct nilfs_btree *btree,
nilfs_btree_node_get_key(btree, right, 0)); nilfs_btree_node_get_key(btree, right, 0));
path[level + 1].bp_index--; path[level + 1].bp_index--;
nilfs_bmap_put_block(&btree->bt_bmap, path[level].bp_sib_bh); brelse(path[level].bp_sib_bh);
path[level].bp_sib_bh = NULL; path[level].bp_sib_bh = NULL;
} }
@@ -1403,7 +1402,7 @@ static int nilfs_btree_prepare_delete(struct nilfs_btree *btree,
&btree->bt_bmap, &path[level].bp_oldreq); &btree->bt_bmap, &path[level].bp_oldreq);
err_out_child_node: err_out_child_node:
for (level--; level >= NILFS_BTREE_LEVEL_NODE_MIN; level--) { for (level--; level >= NILFS_BTREE_LEVEL_NODE_MIN; level--) {
nilfs_bmap_put_block(&btree->bt_bmap, path[level].bp_sib_bh); brelse(path[level].bp_sib_bh);
if (btree->bt_bmap.b_pops->bpop_abort_end_ptr != NULL) if (btree->bt_bmap.b_pops->bpop_abort_end_ptr != NULL)
btree->bt_bmap.b_pops->bpop_abort_end_ptr( btree->bt_bmap.b_pops->bpop_abort_end_ptr(
&btree->bt_bmap, &path[level].bp_oldreq); &btree->bt_bmap, &path[level].bp_oldreq);
@@ -1515,7 +1514,7 @@ static int nilfs_btree_check_delete(struct nilfs_bmap *bmap, __u64 key)
nextmaxkey = (nchildren > 1) ? nextmaxkey = (nchildren > 1) ?
nilfs_btree_node_get_key(btree, node, nchildren - 2) : 0; nilfs_btree_node_get_key(btree, node, nchildren - 2) : 0;
if (bh != NULL) if (bh != NULL)
nilfs_bmap_put_block(bmap, bh); brelse(bh);
return (maxkey == key) && (nextmaxkey < bmap->b_low); return (maxkey == key) && (nextmaxkey < bmap->b_low);
} }
@@ -1563,7 +1562,7 @@ static int nilfs_btree_gather_data(struct nilfs_bmap *bmap,
} }
if (bh != NULL) if (bh != NULL)
nilfs_bmap_put_block(bmap, bh); brelse(bh);
return nitems; return nitems;
} }
@@ -1661,7 +1660,7 @@ nilfs_btree_commit_convert_and_insert(struct nilfs_bmap *bmap,
nilfs_bmap_set_dirty(bmap); nilfs_bmap_set_dirty(bmap);
unlock_buffer(bh); unlock_buffer(bh);
nilfs_bmap_put_block(bmap, bh); brelse(bh);
/* create root node at level 2 */ /* create root node at level 2 */
node = nilfs_btree_get_root(btree); node = nilfs_btree_get_root(btree);
@@ -2176,7 +2175,7 @@ static int nilfs_btree_mark(struct nilfs_bmap *bmap, __u64 key, int level)
if (!buffer_dirty(bh)) if (!buffer_dirty(bh))
nilfs_btnode_mark_dirty(bh); nilfs_btnode_mark_dirty(bh);
nilfs_bmap_put_block(&btree->bt_bmap, bh); brelse(bh);
if (!nilfs_bmap_dirty(&btree->bt_bmap)) if (!nilfs_bmap_dirty(&btree->bt_bmap))
nilfs_bmap_set_dirty(&btree->bt_bmap); nilfs_bmap_set_dirty(&btree->bt_bmap);