diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-07-26 13:30:05 +0100 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-07-26 13:30:05 +0100 |
commit | 33c949697e316f17bb5037ae83509f35ce28f6a9 (patch) | |
tree | 41ea985d7efe7c3c1a2f64326d8de1a45de7af33 /mkfs.c | |
parent | affaba87a2797d4d468faad268cc5e21c96c6c16 (diff) |
New upstream release
Diffstat (limited to 'mkfs.c')
-rw-r--r-- | mkfs.c | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -88,7 +88,7 @@ static int create_metadata_block_groups(struct btrfs_root *root, int mixed, BTRFS_BLOCK_GROUP_DATA); if (ret == -ENOSPC) { fprintf(stderr, - "no space to alloc data/metadata chunk\n"); + "no space to allocate data/metadata chunk\n"); goto err; } BUG_ON(ret); @@ -104,7 +104,7 @@ static int create_metadata_block_groups(struct btrfs_root *root, int mixed, &chunk_start, &chunk_size, BTRFS_BLOCK_GROUP_METADATA); if (ret == -ENOSPC) { - fprintf(stderr, "no space to alloc metadata chunk\n"); + fprintf(stderr, "no space to allocate metadata chunk\n"); goto err; } BUG_ON(ret); @@ -136,7 +136,7 @@ static int create_data_block_groups(struct btrfs_trans_handle *trans, &chunk_start, &chunk_size, BTRFS_BLOCK_GROUP_DATA); if (ret == -ENOSPC) { - fprintf(stderr, "no space to alloc data chunk\n"); + fprintf(stderr, "no space to allocate data chunk\n"); goto err; } BUG_ON(ret); @@ -971,7 +971,7 @@ static int create_chunks(struct btrfs_trans_handle *trans, size_of_data = minimum_data_chunk_size; ret = btrfs_alloc_data_chunk(trans, root->fs_info->extent_root, - &chunk_start, size_of_data, data_type); + &chunk_start, size_of_data, data_type, 0); BUG_ON(ret); ret = btrfs_make_block_group(trans, root->fs_info->extent_root, 0, data_type, BTRFS_FIRST_CHUNK_TREE_OBJECTID, @@ -1205,7 +1205,7 @@ static int is_temp_block_group(struct extent_buffer *node, * 1) Empty chunk * Temp chunk is always empty. * - * 2) profile dismatch with mkfs profile. + * 2) profile mismatch with mkfs profile. * Temp chunk is always in SINGLE * * 3) Size differs with mkfs_alloc @@ -1482,6 +1482,7 @@ int main(int argc, char **argv) } sectorsize = max(sectorsize, (u32)sysconf(_SC_PAGESIZE)); + stripesize = sectorsize; saved_optind = optind; dev_cnt = argc - optind; if (dev_cnt == 0) @@ -1663,7 +1664,7 @@ int main(int argc, char **argv) if (group_profile_max_safe_loss(metadata_profile) < group_profile_max_safe_loss(data_profile)){ fprintf(stderr, - "WARNING: metatdata has lower redundancy than data!\n\n"); + "WARNING: metadata has lower redundancy than data!\n\n"); } mkfs_cfg.label = label; @@ -1675,7 +1676,7 @@ int main(int argc, char **argv) mkfs_cfg.stripesize = stripesize; mkfs_cfg.features = features; - ret = make_btrfs(fd, &mkfs_cfg); + ret = make_btrfs(fd, &mkfs_cfg, NULL); if (ret) { fprintf(stderr, "error during mkfs: %s\n", strerror(-ret)); exit(1); |