Mountable btrfs, with readdir
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index d888cf5..7f4bb72 100644
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -1,36 +1,41 @@
#ifndef __DISKIO__
#define __DISKIO__
-#include "list.h"
-struct btrfs_buffer {
- u64 blocknr;
- int count;
- struct list_head dirty;
- struct list_head cache;
- union {
- struct btrfs_node node;
- struct btrfs_leaf leaf;
- };
-};
-
-struct btrfs_buffer *read_tree_block(struct btrfs_root *root, u64 blocknr);
-struct btrfs_buffer *find_tree_block(struct btrfs_root *root, u64 blocknr);
-int write_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
- struct btrfs_buffer *buf);
-int dirty_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
- struct btrfs_buffer *buf);
-int clean_tree_block(struct btrfs_trans_handle *trans,
- struct btrfs_root *root, struct btrfs_buffer *buf);
-int btrfs_commit_transaction(struct btrfs_trans_handle *trans, struct btrfs_root
- *root, struct btrfs_super_block *s);
-struct btrfs_root *open_ctree(char *filename, struct btrfs_super_block *s);
-struct btrfs_root *open_ctree_fd(int fp, struct btrfs_super_block *super);
-int close_ctree(struct btrfs_root *root, struct btrfs_super_block *s);
-void btrfs_block_release(struct btrfs_root *root, struct btrfs_buffer *buf);
-int write_ctree_super(struct btrfs_trans_handle *trans, struct btrfs_root *root,
- struct btrfs_super_block *s);
-int mkfs(int fd, u64 num_blocks, u32 blocksize);
+#include <linux/buffer_head.h>
#define BTRFS_SUPER_INFO_OFFSET (16 * 1024)
+static inline struct btrfs_node *btrfs_buffer_node(struct buffer_head *bh)
+{
+ return (struct btrfs_node *)bh->b_data;
+}
+
+static inline struct btrfs_leaf *btrfs_buffer_leaf(struct buffer_head *bh)
+{
+ return (struct btrfs_leaf *)bh->b_data;
+}
+
+static inline struct btrfs_header *btrfs_buffer_header(struct buffer_head *bh)
+{
+ return &((struct btrfs_node *)bh->b_data)->header;
+}
+
+struct buffer_head *read_tree_block(struct btrfs_root *root, u64 blocknr);
+struct buffer_head *find_tree_block(struct btrfs_root *root, u64 blocknr);
+int write_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
+ struct buffer_head *buf);
+int dirty_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
+ struct buffer_head *buf);
+int clean_tree_block(struct btrfs_trans_handle *trans,
+ struct btrfs_root *root, struct buffer_head *buf);
+int btrfs_commit_transaction(struct btrfs_trans_handle *trans, struct btrfs_root
+ *root, struct btrfs_super_block *s);
+struct btrfs_root *open_ctree(struct super_block *sb,
+ struct buffer_head *sb_buffer,
+ struct btrfs_super_block *disk_super);
+int close_ctree(struct btrfs_root *root);
+void btrfs_block_release(struct btrfs_root *root, struct buffer_head *buf);
+int write_ctree_super(struct btrfs_trans_handle *trans, struct btrfs_root *root,
+ struct btrfs_super_block *s);
+int mkfs(int fd, u64 num_blocks, u32 blocksize);
#endif