|
@@ -1586,6 +1586,9 @@ struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info,
|
|
|
if (location->objectid == BTRFS_QUOTA_TREE_OBJECTID)
|
|
|
return fs_info->quota_root ? fs_info->quota_root :
|
|
|
ERR_PTR(-ENOENT);
|
|
|
+ if (location->objectid == BTRFS_UUID_TREE_OBJECTID)
|
|
|
+ return fs_info->uuid_root ? fs_info->uuid_root :
|
|
|
+ ERR_PTR(-ENOENT);
|
|
|
again:
|
|
|
root = btrfs_lookup_fs_root(fs_info, location->objectid);
|
|
|
if (root)
|
|
@@ -2044,6 +2047,12 @@ static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root)
|
|
|
info->quota_root->node = NULL;
|
|
|
info->quota_root->commit_root = NULL;
|
|
|
}
|
|
|
+ if (info->uuid_root) {
|
|
|
+ free_extent_buffer(info->uuid_root->node);
|
|
|
+ free_extent_buffer(info->uuid_root->commit_root);
|
|
|
+ info->uuid_root->node = NULL;
|
|
|
+ info->uuid_root->commit_root = NULL;
|
|
|
+ }
|
|
|
if (chunk_root) {
|
|
|
free_extent_buffer(info->chunk_root->node);
|
|
|
free_extent_buffer(info->chunk_root->commit_root);
|
|
@@ -2104,11 +2113,13 @@ int open_ctree(struct super_block *sb,
|
|
|
struct btrfs_root *chunk_root;
|
|
|
struct btrfs_root *dev_root;
|
|
|
struct btrfs_root *quota_root;
|
|
|
+ struct btrfs_root *uuid_root;
|
|
|
struct btrfs_root *log_tree_root;
|
|
|
int ret;
|
|
|
int err = -EINVAL;
|
|
|
int num_backups_tried = 0;
|
|
|
int backup_index = 0;
|
|
|
+ bool create_uuid_tree = false;
|
|
|
|
|
|
tree_root = fs_info->tree_root = btrfs_alloc_root(fs_info);
|
|
|
chunk_root = fs_info->chunk_root = btrfs_alloc_root(fs_info);
|
|
@@ -2704,6 +2715,18 @@ retry_root_backup:
|
|
|
fs_info->quota_root = quota_root;
|
|
|
}
|
|
|
|
|
|
+ location.objectid = BTRFS_UUID_TREE_OBJECTID;
|
|
|
+ uuid_root = btrfs_read_tree_root(tree_root, &location);
|
|
|
+ if (IS_ERR(uuid_root)) {
|
|
|
+ ret = PTR_ERR(uuid_root);
|
|
|
+ if (ret != -ENOENT)
|
|
|
+ goto recovery_tree_root;
|
|
|
+ create_uuid_tree = true;
|
|
|
+ } else {
|
|
|
+ uuid_root->track_dirty = 1;
|
|
|
+ fs_info->uuid_root = uuid_root;
|
|
|
+ }
|
|
|
+
|
|
|
fs_info->generation = generation;
|
|
|
fs_info->last_trans_committed = generation;
|
|
|
|
|
@@ -2890,6 +2913,17 @@ retry_root_backup:
|
|
|
|
|
|
btrfs_qgroup_rescan_resume(fs_info);
|
|
|
|
|
|
+ if (create_uuid_tree) {
|
|
|
+ pr_info("btrfs: creating UUID tree\n");
|
|
|
+ ret = btrfs_create_uuid_tree(fs_info);
|
|
|
+ if (ret) {
|
|
|
+ pr_warn("btrfs: failed to create the UUID tree %d\n",
|
|
|
+ ret);
|
|
|
+ close_ctree(tree_root);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return 0;
|
|
|
|
|
|
fail_qgroup:
|