btrfs-progs: Rename OPEN_CTREE_FS_PARTIAL to OPEN_CTREE_TEMPORARY_SUPER

[platform/upstream/btrfs-progs.git] / disk-io.h

diff --git a/disk-io.h b/disk-io.h
index b4d0227..c449615 100644 (file)
--- a/disk-io.h
+++ b/disk-io.h
@@ -73,8 +73,12 @@ enum btrfs_open_ctree_flags {
         */
        OPEN_CTREE_IGNORE_CHUNK_TREE_ERROR = (1U << 11),
 
-       /* Allow to open a partially created filesystem */
-       OPEN_CTREE_FS_PARTIAL = (1U << 12),
+       /*
+        * Allow to open fs with temporary superblock (BTRFS_MAGIC_PARTIAL),
+        * such fs contains very basic tree layout, just able to be opened.
+        * Such temporary super is used for mkfs or convert.
+        */
+       OPEN_CTREE_TEMPORARY_SUPER = (1U << 12),
 
        /*
         * Invalidate the free space tree (i.e., clear the FREE_SPACE_TREE_VALID
@@ -95,7 +99,7 @@ enum btrfs_read_sb_flags {
         * Read superblock with the fake signature, cannot be used with
         * SBREAD_RECOVER
         */
-       SBREAD_PARTIAL          = (1 << 1),
+       SBREAD_TEMPORARY = (1 << 1),
 };
 
 /*
@@ -115,23 +119,15 @@ static inline u64 btrfs_sb_offset(int mirror)
 struct btrfs_device;
 
 int read_whole_eb(struct btrfs_fs_info *info, struct extent_buffer *eb, int mirror);
-struct extent_buffer* read_tree_block_fs_info(
-               struct btrfs_fs_info *fs_info, u64 bytenr, u32 blocksize,
+struct extent_buffer* read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
                u64 parent_transid);
-static inline struct extent_buffer* read_tree_block(
-               struct btrfs_root *root, u64 bytenr, u32 blocksize,
-               u64 parent_transid)
-{
-       return read_tree_block_fs_info(root->fs_info, bytenr, blocksize,
-                       parent_transid);
-}
 
-int read_extent_data(struct btrfs_root *root, char *data, u64 logical,
+int read_extent_data(struct btrfs_fs_info *fs_info, char *data, u64 logical,
                     u64 *len, int mirror);
-void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,
+void readahead_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr,
                          u64 parent_transid);
 struct extent_buffer* btrfs_find_create_tree_block(
-               struct btrfs_fs_info *fs_info, u64 bytenr, u32 blocksize);
+               struct btrfs_fs_info *fs_info, u64 bytenr);
 
 void btrfs_setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info,
                      u64 objectid);
@@ -168,14 +164,14 @@ static inline int close_ctree(struct btrfs_root *root)
        return close_ctree_fs_info(root->fs_info);
 }
 
-int write_all_supers(struct btrfs_root *root);
+int write_all_supers(struct btrfs_fs_info *fs_info);
 int write_ctree_super(struct btrfs_trans_handle *trans,
-                     struct btrfs_root *root);
+                     struct btrfs_fs_info *fs_info);
 int btrfs_read_dev_super(int fd, struct btrfs_super_block *sb, u64 sb_bytenr,
                unsigned sbflags);
 int btrfs_map_bh_to_logical(struct btrfs_root *root, struct extent_buffer *bh,
                            u64 logical);
-struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root,
+struct extent_buffer *btrfs_find_tree_block(struct btrfs_fs_info *fs_info,
                                            u64 bytenr, u32 blocksize);
 struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info,
                                      struct btrfs_key *location);
@@ -188,20 +184,14 @@ int btrfs_set_buffer_uptodate(struct extent_buffer *buf);
 u32 btrfs_csum_data(char *data, u32 seed, size_t len);
 void btrfs_csum_final(u32 crc, u8 *result);
 
-int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
-                            struct btrfs_root *root);
 int btrfs_open_device(struct btrfs_device *dev);
 int csum_tree_block_size(struct extent_buffer *buf, u16 csum_sectorsize,
                         int verify);
 int verify_tree_block_csum_silent(struct extent_buffer *buf, u16 csum_size);
 int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid);
 int write_tree_block(struct btrfs_trans_handle *trans,
-                    struct btrfs_root *root,
+                    struct btrfs_fs_info *fs_info,
                     struct extent_buffer *eb);
-int write_and_map_eb(struct btrfs_root *root, struct extent_buffer *eb);
-
-/* raid56.c */
-void raid6_gen_syndrome(int disks, size_t bytes, void **ptrs);
-int raid5_gen_result(int nr_devs, size_t stripe_len, int dest, void **data);
+int write_and_map_eb(struct btrfs_fs_info *fs_info, struct extent_buffer *eb);
 
 #endif