btrfs-progs: rename __setup_root and change to return void

Exported function should use a prefix.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/chunk-recover.c b/chunk-recover.c
index 5bde5b13fa03e25ff09b08d7598a4ffa1b268d25..93d29187aff5d20fe083ef491ced60616960b375 100644 (file)
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1488,7 +1488,7 @@ open_ctree_with_broken_chunk(struct recover_control *rc)
        sectorsize = btrfs_super_sectorsize(disk_super);
        stripesize = btrfs_super_stripesize(disk_super);
 
-       __setup_root(nodesize, leafsize, sectorsize, stripesize,
+       btrfs_setup_root(nodesize, leafsize, sectorsize, stripesize,
                     fs_info->chunk_root, fs_info, BTRFS_CHUNK_TREE_OBJECTID);
 
        ret = build_device_maps_by_chunk_records(rc, fs_info->chunk_root);

diff --git a/disk-io.c b/disk-io.c
index bfc2879ce1d5e172b19087a0240b6fa84bb5c38e..f989c2906c333c0d309b7edd0ea41656434cdadd 100644 (file)
--- a/disk-io.c
+++ b/disk-io.c
@@ -478,7 +478,7 @@ int write_tree_block(struct btrfs_trans_handle *trans,
        return write_and_map_eb(trans, root, eb);
 }
 
-int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
+void btrfs_setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
                        u32 stripesize, struct btrfs_root *root,
                        struct btrfs_fs_info *fs_info, u64 objectid)
 {
@@ -502,7 +502,6 @@ int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
        memset(&root->root_key, 0, sizeof(root->root_key));
        memset(&root->root_item, 0, sizeof(root->root_item));
        root->root_key.objectid = objectid;
-       return 0;
 }
 
 static int update_cowonly_root(struct btrfs_trans_handle *trans,
@@ -635,7 +634,7 @@ static int find_and_setup_root(struct btrfs_root *tree_root,
        u32 blocksize;
        u64 generation;
 
-       __setup_root(tree_root->nodesize, tree_root->leafsize,
+       btrfs_setup_root(tree_root->nodesize, tree_root->leafsize,
                     tree_root->sectorsize, tree_root->stripesize,
                     root, fs_info, objectid);
        ret = btrfs_find_last_root(tree_root, objectid,
@@ -671,7 +670,7 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root,
 
        blocksize = tree_root->nodesize;
 
-       __setup_root(tree_root->nodesize, tree_root->leafsize,
+       btrfs_setup_root(tree_root->nodesize, tree_root->leafsize,
                     tree_root->sectorsize, tree_root->stripesize,
                     log_root, fs_info, BTRFS_TREE_LOG_OBJECTID);
 
@@ -735,7 +734,7 @@ struct btrfs_root *btrfs_read_fs_root_no_cache(struct btrfs_fs_info *fs_info,
                goto insert;
        }
 
-       __setup_root(tree_root->nodesize, tree_root->leafsize,
+       btrfs_setup_root(tree_root->nodesize, tree_root->leafsize,
                     tree_root->sectorsize, tree_root->stripesize,
                     root, fs_info, location->objectid);
 
@@ -1003,7 +1002,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr,
        stripesize = btrfs_super_stripesize(sb);
 
        root = fs_info->tree_root;
-       __setup_root(nodesize, leafsize, sectorsize, stripesize,
+       btrfs_setup_root(nodesize, leafsize, sectorsize, stripesize,
                     root, fs_info, BTRFS_ROOT_TREE_OBJECTID);
        blocksize = root->nodesize;
        generation = btrfs_super_generation(sb);
@@ -1192,7 +1191,7 @@ int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info,
        sectorsize = btrfs_super_sectorsize(sb);
        stripesize = btrfs_super_stripesize(sb);
 
-       __setup_root(nodesize, leafsize, sectorsize, stripesize,
+       btrfs_setup_root(nodesize, leafsize, sectorsize, stripesize,
                     fs_info->chunk_root, fs_info, BTRFS_CHUNK_TREE_OBJECTID);
 
        ret = btrfs_read_sys_array(fs_info->chunk_root);

diff --git a/disk-io.h b/disk-io.h
index 1080fc16f1aa4d584a2f6496809e39004d989aa6..1fc0bb74edfcf88c0d0b2fdb892a793076ac2b99 100644 (file)
--- a/disk-io.h
+++ b/disk-io.h
@@ -120,7 +120,7 @@ void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,
 struct extent_buffer* btrfs_find_create_tree_block(
                struct btrfs_fs_info *fs_info, u64 bytenr, u32 blocksize);
 
-int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
+void btrfs_setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
                         u32 stripesize, struct btrfs_root *root,
                         struct btrfs_fs_info *fs_info, u64 objectid);
 int clean_tree_block(struct btrfs_trans_handle *trans,