evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nilfs2: use nilfs_btnode_create_block function

Browse source 
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>
This commit is contained in:
Ryusuke Konishi 2009-11-13 16:25:19 +09:00
parent d501d73689
commit 45f4910bc0
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/nilfs2/btnode.c
View file

@ -270,12 +270,13 @@ retry:
unlock_page(obh->b_page); unlock_page(obh->b_page);
} }
err = nilfs_btnode_get(btnc, newkey, 0, &nbh, 1); nbh = nilfs_btnode_create_block(btnc, newkey);
if (likely(!err)) { if (!nbh)
return -ENOMEM;
BUG_ON(nbh == obh); BUG_ON(nbh == obh);
ctxt->newbh = nbh; ctxt->newbh = nbh;
} return 0;
return err;
failed_unlock: failed_unlock:
unlock_page(obh->b_page); unlock_page(obh->b_page);

13
fs/nilfs2/btree.c
View file

@ -122,12 +122,15 @@ static int nilfs_btree_get_new_block(const struct nilfs_btree *btree,
{ {
struct address_space *btnc = struct address_space *btnc =
&NILFS_BMAP_I((struct nilfs_bmap *)btree)->i_btnode_cache; &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); bh = nilfs_btnode_create_block(btnc, ptr);
if (!ret) if (!bh)
set_buffer_nilfs_volatile(*bhp); return -ENOMEM;
return ret;
set_buffer_nilfs_volatile(bh);
*bhp = bh;
return 0;
} }
static inline int static inline int