Skip to content

Commit

Permalink
nilfs2: use nilfs_btnode_create_block function
Browse files Browse the repository at this point in the history
This displaces nilfs_btnode_get() use to create new btree node block
with nilfs_btnode_create_block.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
  • Loading branch information
Ryusuke Konishi committed Nov 20, 2009
1 parent d501d73 commit 45f4910
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
13 changes: 7 additions & 6 deletions fs/nilfs2/btnode.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,13 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc,
unlock_page(obh->b_page);
}

err = nilfs_btnode_get(btnc, newkey, 0, &nbh, 1);
if (likely(!err)) {
BUG_ON(nbh == obh);
ctxt->newbh = nbh;
}
return err;
nbh = nilfs_btnode_create_block(btnc, newkey);
if (!nbh)
return -ENOMEM;

BUG_ON(nbh == obh);
ctxt->newbh = nbh;
return 0;

failed_unlock:
unlock_page(obh->b_page);
Expand Down
13 changes: 8 additions & 5 deletions fs/nilfs2/btree.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,15 @@ static int nilfs_btree_get_new_block(const struct nilfs_btree *btree,
{
struct address_space *btnc =
&NILFS_BMAP_I((struct nilfs_bmap *)btree)->i_btnode_cache;
int ret;
struct buffer_head *bh;

ret = nilfs_btnode_get(btnc, ptr, 0, bhp, 1);
if (!ret)
set_buffer_nilfs_volatile(*bhp);
return ret;
bh = nilfs_btnode_create_block(btnc, ptr);
if (!bh)
return -ENOMEM;

set_buffer_nilfs_volatile(bh);
*bhp = bh;
return 0;
}

static inline int
Expand Down

0 comments on commit 45f4910

Please sign in to comment.