forked from Mirrors/btrfs-progs
btrfs-progs: mkfs: return errors from block group creation functions
No more BUG_ONs, we don't care about cleanup as the filesystem is supposed to be marked as partial. Signed-off-by: David Sterba <dsterba@suse.com>master
parent
2ff04db5f4
commit
7b6c4bb33f
83
mkfs.c
83
mkfs.c
|
@ -79,7 +79,8 @@ static int create_metadata_block_groups(struct btrfs_root *root, int mixed,
|
||||||
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
||||||
0, BTRFS_MKFS_SYSTEM_GROUP_SIZE);
|
0, BTRFS_MKFS_SYSTEM_GROUP_SIZE);
|
||||||
allocation->system += BTRFS_MKFS_SYSTEM_GROUP_SIZE;
|
allocation->system += BTRFS_MKFS_SYSTEM_GROUP_SIZE;
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
if (mixed) {
|
if (mixed) {
|
||||||
ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
|
ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
|
||||||
|
@ -90,13 +91,15 @@ static int create_metadata_block_groups(struct btrfs_root *root, int mixed,
|
||||||
error("no space to allocate data/metadata chunk");
|
error("no space to allocate data/metadata chunk");
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
ret = btrfs_make_block_group(trans, root, 0,
|
ret = btrfs_make_block_group(trans, root, 0,
|
||||||
BTRFS_BLOCK_GROUP_METADATA |
|
BTRFS_BLOCK_GROUP_METADATA |
|
||||||
BTRFS_BLOCK_GROUP_DATA,
|
BTRFS_BLOCK_GROUP_DATA,
|
||||||
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
||||||
chunk_start, chunk_size);
|
chunk_start, chunk_size);
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
allocation->mixed += chunk_size;
|
allocation->mixed += chunk_size;
|
||||||
} else {
|
} else {
|
||||||
ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
|
ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
|
||||||
|
@ -106,17 +109,19 @@ static int create_metadata_block_groups(struct btrfs_root *root, int mixed,
|
||||||
error("no space to allocate metadata chunk");
|
error("no space to allocate metadata chunk");
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
ret = btrfs_make_block_group(trans, root, 0,
|
ret = btrfs_make_block_group(trans, root, 0,
|
||||||
BTRFS_BLOCK_GROUP_METADATA,
|
BTRFS_BLOCK_GROUP_METADATA,
|
||||||
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
||||||
chunk_start, chunk_size);
|
chunk_start, chunk_size);
|
||||||
allocation->metadata += chunk_size;
|
allocation->metadata += chunk_size;
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
root->fs_info->system_allocs = 0;
|
root->fs_info->system_allocs = 0;
|
||||||
btrfs_commit_transaction(trans, root);
|
ret = btrfs_commit_transaction(trans, root);
|
||||||
|
|
||||||
err:
|
err:
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -138,13 +143,15 @@ static int create_data_block_groups(struct btrfs_trans_handle *trans,
|
||||||
error("no space to allocate data chunk");
|
error("no space to allocate data chunk");
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
ret = btrfs_make_block_group(trans, root, 0,
|
ret = btrfs_make_block_group(trans, root, 0,
|
||||||
BTRFS_BLOCK_GROUP_DATA,
|
BTRFS_BLOCK_GROUP_DATA,
|
||||||
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
||||||
chunk_start, chunk_size);
|
chunk_start, chunk_size);
|
||||||
allocation->data += chunk_size;
|
allocation->data += chunk_size;
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
err:
|
err:
|
||||||
|
@ -226,23 +233,29 @@ static int create_one_raid_group(struct btrfs_trans_handle *trans,
|
||||||
error("not enough free space to allocate chunk");
|
error("not enough free space to allocate chunk");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
ret = btrfs_make_block_group(trans, root->fs_info->extent_root, 0,
|
ret = btrfs_make_block_group(trans, root->fs_info->extent_root, 0,
|
||||||
type, BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
type, BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
||||||
chunk_start, chunk_size);
|
chunk_start, chunk_size);
|
||||||
if ((type & BTRFS_BLOCK_GROUP_TYPE_MASK) == BTRFS_BLOCK_GROUP_DATA)
|
|
||||||
allocation->data += chunk_size;
|
|
||||||
else if ((type & BTRFS_BLOCK_GROUP_TYPE_MASK) == BTRFS_BLOCK_GROUP_METADATA)
|
|
||||||
allocation->metadata += chunk_size;
|
|
||||||
else if ((type & BTRFS_BLOCK_GROUP_TYPE_MASK) == BTRFS_BLOCK_GROUP_SYSTEM)
|
|
||||||
allocation->system += chunk_size;
|
|
||||||
else if ((type & BTRFS_BLOCK_GROUP_TYPE_MASK) ==
|
|
||||||
(BTRFS_BLOCK_GROUP_METADATA|BTRFS_BLOCK_GROUP_DATA))
|
|
||||||
allocation->mixed += chunk_size;
|
|
||||||
else
|
|
||||||
BUG_ON(1);
|
|
||||||
|
|
||||||
BUG_ON(ret);
|
type &= BTRFS_BLOCK_GROUP_TYPE_MASK;
|
||||||
|
if (type == BTRFS_BLOCK_GROUP_DATA) {
|
||||||
|
allocation->data += chunk_size;
|
||||||
|
} else if (type == BTRFS_BLOCK_GROUP_METADATA) {
|
||||||
|
allocation->metadata += chunk_size;
|
||||||
|
} else if (type == BTRFS_BLOCK_GROUP_SYSTEM) {
|
||||||
|
allocation->system += chunk_size;
|
||||||
|
} else if (type ==
|
||||||
|
(BTRFS_BLOCK_GROUP_METADATA | BTRFS_BLOCK_GROUP_DATA)) {
|
||||||
|
allocation->mixed += chunk_size;
|
||||||
|
} else {
|
||||||
|
error("unrecognized profile type: 0x%llx",
|
||||||
|
(unsigned long long)type);
|
||||||
|
ret = -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -259,21 +272,24 @@ static int create_raid_groups(struct btrfs_trans_handle *trans,
|
||||||
ret = create_one_raid_group(trans, root,
|
ret = create_one_raid_group(trans, root,
|
||||||
BTRFS_BLOCK_GROUP_SYSTEM |
|
BTRFS_BLOCK_GROUP_SYSTEM |
|
||||||
metadata_profile, allocation);
|
metadata_profile, allocation);
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
if (mixed)
|
if (mixed)
|
||||||
meta_flags |= BTRFS_BLOCK_GROUP_DATA;
|
meta_flags |= BTRFS_BLOCK_GROUP_DATA;
|
||||||
|
|
||||||
ret = create_one_raid_group(trans, root, meta_flags |
|
ret = create_one_raid_group(trans, root, meta_flags |
|
||||||
metadata_profile, allocation);
|
metadata_profile, allocation);
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
}
|
}
|
||||||
if (!mixed && data_profile) {
|
if (!mixed && data_profile) {
|
||||||
ret = create_one_raid_group(trans, root,
|
ret = create_one_raid_group(trans, root,
|
||||||
BTRFS_BLOCK_GROUP_DATA |
|
BTRFS_BLOCK_GROUP_DATA |
|
||||||
data_profile, allocation);
|
data_profile, allocation);
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
recow_roots(trans, root);
|
recow_roots(trans, root);
|
||||||
|
|
||||||
|
@ -290,7 +306,8 @@ static int create_data_reloc_tree(struct btrfs_trans_handle *trans,
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = btrfs_copy_root(trans, root, root->node, &tmp, objectid);
|
ret = btrfs_copy_root(trans, root, root->node, &tmp, objectid);
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
memcpy(&root_item, &root->root_item, sizeof(root_item));
|
memcpy(&root_item, &root->root_item, sizeof(root_item));
|
||||||
btrfs_set_root_bytenr(&root_item, tmp->start);
|
btrfs_set_root_bytenr(&root_item, tmp->start);
|
||||||
|
@ -303,8 +320,8 @@ static int create_data_reloc_tree(struct btrfs_trans_handle *trans,
|
||||||
location.offset = 0;
|
location.offset = 0;
|
||||||
ret = btrfs_insert_root(trans, root->fs_info->tree_root,
|
ret = btrfs_insert_root(trans, root->fs_info->tree_root,
|
||||||
&location, &root_item);
|
&location, &root_item);
|
||||||
BUG_ON(ret);
|
|
||||||
return 0;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_usage(int ret)
|
static void print_usage(int ret)
|
||||||
|
@ -968,12 +985,14 @@ static int create_chunks(struct btrfs_trans_handle *trans,
|
||||||
for (i = 0; i < num_of_meta_chunks; i++) {
|
for (i = 0; i < num_of_meta_chunks; i++) {
|
||||||
ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
|
ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
|
||||||
&chunk_start, &chunk_size, meta_type);
|
&chunk_start, &chunk_size, meta_type);
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
ret = btrfs_make_block_group(trans, root->fs_info->extent_root, 0,
|
ret = btrfs_make_block_group(trans, root->fs_info->extent_root, 0,
|
||||||
meta_type, BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
meta_type, BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
||||||
chunk_start, chunk_size);
|
chunk_start, chunk_size);
|
||||||
allocation->metadata += chunk_size;
|
allocation->metadata += chunk_size;
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
set_extent_dirty(&root->fs_info->free_space_cache,
|
set_extent_dirty(&root->fs_info->free_space_cache,
|
||||||
chunk_start, chunk_start + chunk_size - 1, 0);
|
chunk_start, chunk_start + chunk_size - 1, 0);
|
||||||
}
|
}
|
||||||
|
@ -983,12 +1002,14 @@ static int create_chunks(struct btrfs_trans_handle *trans,
|
||||||
|
|
||||||
ret = btrfs_alloc_data_chunk(trans, root->fs_info->extent_root,
|
ret = btrfs_alloc_data_chunk(trans, root->fs_info->extent_root,
|
||||||
&chunk_start, size_of_data, data_type, 0);
|
&chunk_start, size_of_data, data_type, 0);
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
ret = btrfs_make_block_group(trans, root->fs_info->extent_root, 0,
|
ret = btrfs_make_block_group(trans, root->fs_info->extent_root, 0,
|
||||||
data_type, BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
data_type, BTRFS_FIRST_CHUNK_TREE_OBJECTID,
|
||||||
chunk_start, size_of_data);
|
chunk_start, size_of_data);
|
||||||
allocation->data += size_of_data;
|
allocation->data += size_of_data;
|
||||||
BUG_ON(ret);
|
if (ret)
|
||||||
|
return ret;
|
||||||
set_extent_dirty(&root->fs_info->free_space_cache,
|
set_extent_dirty(&root->fs_info->free_space_cache,
|
||||||
chunk_start, chunk_start + size_of_data - 1, 0);
|
chunk_start, chunk_start + size_of_data - 1, 0);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in New Issue