@@ -198,104 +198,6 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
return 0;
}
-/*
- * Create a new tree root, with root objectid set to @objectid.
- *
- * NOTE: Doesn't support tree with non-zero offset, like data reloc tree.
- */
-int btrfs_create_root(struct btrfs_trans_handle *trans,
- struct btrfs_fs_info *fs_info, u64 objectid)
-{
- struct extent_buffer *node;
- struct btrfs_root *new_root;
- struct btrfs_disk_key disk_key;
- struct btrfs_key location;
- struct btrfs_root_item root_item = { 0 };
- int ret;
-
- new_root = malloc(sizeof(*new_root));
- if (!new_root)
- return -ENOMEM;
-
- btrfs_setup_root(new_root, fs_info, objectid);
- if (!is_fstree(objectid))
- new_root->track_dirty = 1;
- add_root_to_dirty_list(new_root);
-
- new_root->objectid = objectid;
- new_root->root_key.objectid = objectid;
- new_root->root_key.type = BTRFS_ROOT_ITEM_KEY;
- new_root->root_key.offset = 0;
-
- node = btrfs_alloc_free_block(trans, new_root, fs_info->nodesize,
- objectid, &disk_key, 0, 0, 0);
- if (IS_ERR(node)) {
- ret = PTR_ERR(node);
- error("failed to create root node for tree %llu: %d (%m)",
- objectid, ret);
- return ret;
- }
- new_root->node = node;
-
- ret = btrfs_inc_ref(trans, new_root, node, 0);
- if (ret < 0)
- goto free;
-
- /*
- * Special tree roots may need to modify pointers in @fs_info
- * Only quota is supported yet.
- */
- switch (objectid) {
- case BTRFS_QUOTA_TREE_OBJECTID:
- if (fs_info->quota_root) {
- error("quota root already exists");
- ret = -EEXIST;
- goto free;
- }
- fs_info->quota_root = new_root;
- fs_info->quota_enabled = 1;
- break;
- /*
- * Essential trees can't be created by this function, yet.
- * As we expect such skeleton exists, or a lot of functions like
- * btrfs_alloc_free_block() doesn't work at all
- */
- case BTRFS_ROOT_TREE_OBJECTID:
- case BTRFS_EXTENT_TREE_OBJECTID:
- case BTRFS_CHUNK_TREE_OBJECTID:
- case BTRFS_FS_TREE_OBJECTID:
- ret = -EEXIST;
- goto free;
- default:
- /* Subvolume trees don't need special handling */
- if (is_fstree(objectid))
- break;
- /* Other special trees are not supported yet */
- ret = -ENOTTY;
- goto free;
- }
- btrfs_mark_buffer_dirty(node);
- btrfs_set_root_bytenr(&root_item, btrfs_header_bytenr(node));
- btrfs_set_root_level(&root_item, 0);
- btrfs_set_root_generation(&root_item, trans->transid);
- btrfs_set_root_dirid(&root_item, 0);
- btrfs_set_root_refs(&root_item, 1);
- btrfs_set_root_used(&root_item, fs_info->nodesize);
- location.objectid = objectid;
- location.type = BTRFS_ROOT_ITEM_KEY;
- location.offset = 0;
-
- ret = btrfs_insert_root(trans, fs_info->tree_root, &location, &root_item);
- if (ret < 0)
- goto free;
- return ret;
-
-free:
- free_extent_buffer(node);
- free(new_root);
- return ret;
-}
-
/*
* check if the tree block can be shared by multiple trees
*/
@@ -2758,8 +2758,6 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct extent_buffer *buf,
struct extent_buffer **cow_ret, u64 new_root_objectid);
-int btrfs_create_root(struct btrfs_trans_handle *trans,
- struct btrfs_fs_info *fs_info, u64 objectid);
int btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,
u32 data_size);
int btrfs_truncate_item(struct btrfs_path *path, u32 new_size, int from_end);
@@ -918,12 +918,18 @@ static int setup_quota_root(struct btrfs_fs_info *fs_info)
error("failed to start transaction: %d (%m)", ret);
return ret;
}
- ret = btrfs_create_root(trans, fs_info, BTRFS_QUOTA_TREE_OBJECTID);
- if (ret < 0) {
+
+ key.objectid = BTRFS_QUOTA_TREE_OBJECTID;
+ key.type = BTRFS_ROOT_ITEM_KEY;
+ key.offset = 0;
+
+ quota_root = btrfs_create_tree(trans, fs_info, &key);
+ if (IS_ERR(quota_root)) {
+ ret = PTR_ERR(quota_root);
error("failed to create quota root: %d (%m)", ret);
goto fail;
}
- quota_root = fs_info->quota_root;
+ fs_info->quota_root = quota_root;
key.objectid = 0;
key.type = BTRFS_QGROUP_STATUS_KEY;
The only user of this is mkfs to make the quota root, everybody else uses btrfs_create_tree(). Fix mkfs to use the btrfs_create_tree() helper and delete btrfs_create_root(). Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- kernel-shared/ctree.c | 98 ------------------------------------------- kernel-shared/ctree.h | 2 - mkfs/main.c | 12 ++++-- 3 files changed, 9 insertions(+), 103 deletions(-)