nilfs2: move routine to set segment usage into sufile

[safe/jmp/linux-2.6] / fs / nilfs2 / btree.c

diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c
index c9aab29..139b113 100644 (file)
--- a/fs/nilfs2/btree.c
+++ b/fs/nilfs2/btree.c
@@ -114,7 +114,18 @@ static int nilfs_btree_get_block(const struct nilfs_btree *btree, __u64 ptr,
 {
        struct address_space *btnc =
                &NILFS_BMAP_I((struct nilfs_bmap *)btree)->i_btnode_cache;
-       return nilfs_btnode_get(btnc, ptr, 0, bhp, 0);
+       int err;
+
+       err = nilfs_btnode_submit_block(btnc, ptr, 0, bhp);
+       if (err)
+               return err == -EEXIST ? 0 : err;
+
+       wait_on_buffer(*bhp);
+       if (!buffer_uptodate(*bhp)) {
+               brelse(*bhp);
+               return -EIO;
+       }
+       return 0;
 }
 
 static int nilfs_btree_get_new_block(const struct nilfs_btree *btree,
@@ -122,12 +133,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