btrfs-progs: rename __setup_root and change to return void

Exported function should use a prefix.

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

1 files changed, 6 insertions, 7 deletions

diff --git a/disk-io.c b/disk-io.c
index bfc2879c..f989c290 100644
--- 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);