Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[~andy/linux] / fs / nilfs2 / btree.h

diff --git a/fs/nilfs2/btree.h b/fs/nilfs2/btree.h
index 43c8c5b541fd84c09d0af119b8f555a247d04522..22c02e35b6ef427b2905936810f6fd96ce8df071 100644 (file)
--- a/fs/nilfs2/btree.h
+++ b/fs/nilfs2/btree.h
@@ -30,14 +30,6 @@
 #include "btnode.h"
 #include "bmap.h"
 
-/**
- * struct nilfs_btree - B-tree structure
- * @bt_bmap: bmap base structure
- */
-struct nilfs_btree {
-       struct nilfs_bmap bt_bmap;
-};
-
 /**
  * struct nilfs_btree_path - A path on which B-tree operations are executed
  * @bp_bh: buffer head of node block
@@ -54,7 +46,7 @@ struct nilfs_btree_path {
        union nilfs_bmap_ptr_req bp_oldreq;
        union nilfs_bmap_ptr_req bp_newreq;
        struct nilfs_btnode_chkey_ctxt bp_ctxt;
-       void (*bp_op)(struct nilfs_btree *, struct nilfs_btree_path *,
+       void (*bp_op)(struct nilfs_bmap *, struct nilfs_btree_path *,
                      int, __u64 *, __u64 *);
 };
 
@@ -80,4 +72,6 @@ int nilfs_btree_convert_and_insert(struct nilfs_bmap *, __u64, __u64,
                                   const __u64 *, const __u64 *, int);
 void nilfs_btree_init_gc(struct nilfs_bmap *);
 
+int nilfs_btree_broken_node_block(struct buffer_head *bh);
+
 #endif /* _NILFS_BTREE_H */