btrfs-progs: check: introduce function to check an extent
[platform/upstream/btrfs-progs.git] / mkfs.c
diff --git a/mkfs.c b/mkfs.c
index 10481b8..f30f057 100644 (file)
--- a/mkfs.c
+++ b/mkfs.c
@@ -17,6 +17,7 @@
  */
 
 #include "kerncompat.h"
+#include "androidcompat.h"
 
 #include <sys/ioctl.h>
 #include <sys/mount.h>
@@ -25,7 +26,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/dir.h>
+/* #include <sys/dir.h> included via androidcompat.h */
 #include <fcntl.h>
 #include <unistd.h>
 #include <getopt.h>
@@ -41,6 +42,7 @@
 #include "volumes.h"
 #include "transaction.h"
 #include "utils.h"
+#include "list_sort.h"
 
 static u64 index_cnt = 2;
 static int verbose = 1;
@@ -59,11 +61,10 @@ struct mkfs_allocation {
        u64 system;
 };
 
-static int make_root_dir(struct btrfs_root *root, int mixed,
+static int create_metadata_block_groups(struct btrfs_root *root, int mixed,
                                struct mkfs_allocation *allocation)
 {
        struct btrfs_trans_handle *trans;
-       struct btrfs_key location;
        u64 bytes_used;
        u64 chunk_start = 0;
        u64 chunk_size = 0;
@@ -87,7 +88,7 @@ static int make_root_dir(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);
@@ -103,7 +104,7 @@ static int make_root_dir(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);
@@ -117,15 +118,25 @@ static int make_root_dir(struct btrfs_root *root, int mixed,
 
        root->fs_info->system_allocs = 0;
        btrfs_commit_transaction(trans, root);
-       trans = btrfs_start_transaction(root, 1);
-       BUG_ON(!trans);
+
+err:
+       return ret;
+}
+
+static int create_data_block_groups(struct btrfs_trans_handle *trans,
+               struct btrfs_root *root, int mixed,
+               struct mkfs_allocation *allocation)
+{
+       u64 chunk_start = 0;
+       u64 chunk_size = 0;
+       int ret = 0;
 
        if (!mixed) {
                ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
                                        &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);
@@ -137,6 +148,16 @@ static int make_root_dir(struct btrfs_root *root, int mixed,
                BUG_ON(ret);
        }
 
+err:
+       return ret;
+}
+
+static int make_root_dir(struct btrfs_trans_handle *trans, struct btrfs_root *root,
+               struct mkfs_allocation *allocation)
+{
+       struct btrfs_key location;
+       int ret;
+
        ret = btrfs_make_root_dir(trans, root->fs_info->tree_root,
                              BTRFS_ROOT_TREE_DIR_OBJECTID);
        if (ret)
@@ -159,7 +180,6 @@ static int make_root_dir(struct btrfs_root *root, int mixed,
        if (ret)
                goto err;
 
-       btrfs_commit_transaction(trans, root);
 err:
        return ret;
 }
@@ -229,11 +249,9 @@ static int create_one_raid_group(struct btrfs_trans_handle *trans,
 
 static int create_raid_groups(struct btrfs_trans_handle *trans,
                              struct btrfs_root *root, u64 data_profile,
-                             int data_profile_opt, u64 metadata_profile,
-                             int mixed,
+                             u64 metadata_profile, int mixed,
                              struct mkfs_allocation *allocation)
 {
-       u64 num_devices = btrfs_super_num_devices(root->fs_info->super_copy);
        int ret;
 
        if (metadata_profile) {
@@ -252,7 +270,7 @@ static int create_raid_groups(struct btrfs_trans_handle *trans,
                BUG_ON(ret);
 
        }
-       if (!mixed && num_devices > 1 && data_profile) {
+       if (!mixed && data_profile) {
                ret = create_one_raid_group(trans, root,
                                            BTRFS_BLOCK_GROUP_DATA |
                                            data_profile, allocation);
@@ -290,9 +308,7 @@ static int create_data_reloc_tree(struct btrfs_trans_handle *trans,
        return 0;
 }
 
-
-static void print_usage(void) __attribute__((noreturn));
-static void print_usage(void)
+static void print_usage(int ret)
 {
        fprintf(stderr, "usage: mkfs.btrfs [options] dev [ dev ... ]\n");
        fprintf(stderr, "options:\n");
@@ -312,8 +328,7 @@ static void print_usage(void)
        fprintf(stderr, "\t-U|--uuid UUID          specify the filesystem UUID\n");
        fprintf(stderr, "\t-q|--quiet              no messages except errors\n");
        fprintf(stderr, "\t-V|--version            print the mkfs.btrfs version and exit\n");
-       fprintf(stderr, "%s\n", PACKAGE_STRING);
-       exit(1);
+       exit(ret);
 }
 
 static void print_version(void) __attribute__((noreturn));
@@ -325,7 +340,7 @@ static void print_version(void)
 
 static u64 parse_profile(char *s)
 {
-       if (strcmp(s, "raid0") == 0) {
+       if (strcasecmp(s, "raid0") == 0) {
                return BTRFS_BLOCK_GROUP_RAID0;
        } else if (strcasecmp(s, "raid1") == 0) {
                return BTRFS_BLOCK_GROUP_RAID1;
@@ -341,7 +356,7 @@ static u64 parse_profile(char *s)
                return 0;
        } else {
                fprintf(stderr, "Unknown profile %s\n", s);
-               print_usage();
+               exit(1);
        }
        /* not reached */
        return 0;
@@ -576,16 +591,15 @@ static int add_symbolic_link(struct btrfs_trans_handle *trans,
                             u64 objectid, const char *path_name)
 {
        int ret;
-       u64 sectorsize = root->sectorsize;
-       char *buf = malloc(sectorsize);
+       char buf[PATH_MAX];
 
-       ret = readlink(path_name, buf, sectorsize);
+       ret = readlink(path_name, buf, sizeof(buf));
        if (ret <= 0) {
                fprintf(stderr, "readlink failed for %s\n", path_name);
                goto fail;
        }
-       if (ret >= sectorsize) {
-               fprintf(stderr, "symlink too long for %s", path_name);
+       if (ret >= sizeof(buf)) {
+               fprintf(stderr, "symlink too long for %s\n", path_name);
                ret = -1;
                goto fail;
        }
@@ -594,7 +608,6 @@ static int add_symbolic_link(struct btrfs_trans_handle *trans,
        ret = btrfs_insert_inline_extent(trans, root, objectid, 0,
                                         buf, ret + 1);
 fail:
-       free(buf);
        return ret;
 }
 
@@ -632,6 +645,12 @@ static int add_file_items(struct btrfs_trans_handle *trans,
 
        if (st->st_size <= BTRFS_MAX_INLINE_DATA_SIZE(root)) {
                char *buffer = malloc(st->st_size);
+
+               if (!buffer) {
+                       ret = -ENOMEM;
+                       goto end;
+               }
+
                ret_read = pread64(fd, buffer, st->st_size, bytes_read);
                if (ret_read == -1) {
                        fprintf(stderr, "%s read failed\n", path_name);
@@ -652,12 +671,11 @@ static int add_file_items(struct btrfs_trans_handle *trans,
         * do our IO in extent buffers so it can work
         * against any raid type
         */
-       eb = malloc(sizeof(*eb) + sectorsize);
+       eb = calloc(1, sizeof(*eb) + sectorsize);
        if (!eb) {
                ret = -ENOMEM;
                goto end;
        }
-       memset(eb, 0, sizeof(*eb) + sectorsize);
 
 again:
 
@@ -765,6 +783,8 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
 
        /* Add list for source directory */
        dir_entry = malloc(sizeof(struct directory_name_entry));
+       if (!dir_entry)
+               return -ENOMEM;
        dir_entry->dir_name = dir_name;
        dir_entry->path = realpath(dir_name, real_path);
        if (!dir_entry->path) {
@@ -866,6 +886,10 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
 
                        if (S_ISDIR(st.st_mode)) {
                                dir_entry = malloc(sizeof(struct directory_name_entry));
+                               if (!dir_entry) {
+                                       ret = -ENOMEM;
+                                       goto fail;
+                               }
                                dir_entry->dir_name = cur_file->d_name;
                                dir_entry->path = make_path(parent_dir_entry->path,
                                                            cur_file->d_name);
@@ -911,7 +935,7 @@ fail_no_dir:
 static int open_target(char *output_name)
 {
        int output_fd;
-       output_fd = open(output_name, O_CREAT | O_RDWR | O_TRUNC,
+       output_fd = open(output_name, O_CREAT | O_RDWR,
                         S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
 
        return output_fd;
@@ -947,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,
@@ -1005,16 +1029,15 @@ out:
  * This ignores symlinks with unreadable targets and subdirs that can't
  * be read.  It's a best-effort to give a rough estimate of the size of
  * a subdir.  It doesn't guarantee that prepopulating btrfs from this
- * tree won't still run out of space. 
- *
- * The rounding up to 4096 is questionable.  Previous code used du -B 4096.
+ * tree won't still run out of space.
  */
 static u64 global_total_size;
+static u64 fs_block_size;
 static int ftw_add_entry_size(const char *fpath, const struct stat *st,
                              int type)
 {
        if (type == FTW_F || type == FTW_D)
-               global_total_size += round_up(st->st_size, 4096);
+               global_total_size += round_up(st->st_size, fs_block_size);
 
        return 0;
 }
@@ -1034,6 +1057,7 @@ static u64 size_sourcedir(char *dir_name, u64 sectorsize,
                        allocated_meta_size / default_chunk_size;
 
        global_total_size = 0;
+       fs_block_size = sectorsize;
        ret = ftw(dir_name, ftw_add_entry_size, 10);
        dir_size = global_total_size;
        if (ret < 0) {
@@ -1062,32 +1086,29 @@ static u64 size_sourcedir(char *dir_name, u64 sectorsize,
        return total_size;
 }
 
-static int zero_output_file(int out_fd, u64 size, u32 sectorsize)
+static int zero_output_file(int out_fd, u64 size)
 {
-       int len = sectorsize;
-       int loop_num = size / sectorsize;
+       int loop_num;
        u64 location = 0;
-       char *buf = malloc(len);
+       char buf[4096];
        int ret = 0, i;
        ssize_t written;
 
-       if (!buf)
-               return -ENOMEM;
-       memset(buf, 0, len);
+       memset(buf, 0, 4096);
+       loop_num = size / 4096;
        for (i = 0; i < loop_num; i++) {
-               written = pwrite64(out_fd, buf, len, location);
-               if (written != len)
+               written = pwrite64(out_fd, buf, 4096, location);
+               if (written != 4096)
                        ret = -EIO;
-               location += sectorsize;
+               location += 4096;
        }
-       free(buf);
        return ret;
 }
 
 static int is_ssd(const char *file)
 {
        blkid_probe probe;
-       char wholedisk[32];
+       char wholedisk[PATH_MAX];
        char sysfs_path[PATH_MAX];
        dev_t devno;
        int fd;
@@ -1132,13 +1153,209 @@ static int is_ssd(const char *file)
        return !atoi((const char *)&rotational);
 }
 
-int main(int ac, char **av)
+static int _cmp_device_by_id(void *priv, struct list_head *a,
+                            struct list_head *b)
+{
+       return list_entry(a, struct btrfs_device, dev_list)->devid -
+              list_entry(b, struct btrfs_device, dev_list)->devid;
+}
+
+static void list_all_devices(struct btrfs_root *root)
+{
+       struct btrfs_fs_devices *fs_devices;
+       struct btrfs_device *device;
+       int number_of_devices = 0;
+       u64 total_block_count = 0;
+
+       fs_devices = root->fs_info->fs_devices;
+
+       list_for_each_entry(device, &fs_devices->devices, dev_list)
+               number_of_devices++;
+
+       list_sort(NULL, &fs_devices->devices, _cmp_device_by_id);
+
+       printf("Number of devices:  %d\n", number_of_devices);
+       /* printf("Total devices size: %10s\n", */
+               /* pretty_size(total_block_count)); */
+       printf("Devices:\n");
+       printf("   ID        SIZE  PATH\n");
+       list_for_each_entry(device, &fs_devices->devices, dev_list) {
+               printf("  %3llu  %10s  %s\n",
+                       device->devid,
+                       pretty_size(device->total_bytes),
+                       device->name);
+               total_block_count += device->total_bytes;
+       }
+
+       printf("\n");
+}
+
+static int is_temp_block_group(struct extent_buffer *node,
+                              struct btrfs_block_group_item *bgi,
+                              u64 data_profile, u64 meta_profile,
+                              u64 sys_profile)
+{
+       u64 flag = btrfs_disk_block_group_flags(node, bgi);
+       u64 flag_type = flag & BTRFS_BLOCK_GROUP_TYPE_MASK;
+       u64 flag_profile = flag & BTRFS_BLOCK_GROUP_PROFILE_MASK;
+       u64 used = btrfs_disk_block_group_used(node, bgi);
+
+       /*
+        * Chunks meets all the following conditions is a temp chunk
+        * 1) Empty chunk
+        * Temp chunk is always empty.
+        *
+        * 2) profile mismatch with mkfs profile.
+        * Temp chunk is always in SINGLE
+        *
+        * 3) Size differs with mkfs_alloc
+        * Special case for SINGLE/SINGLE btrfs.
+        * In that case, temp data chunk and real data chunk are always empty.
+        * So we need to use mkfs_alloc to be sure which chunk is the newly
+        * allocated.
+        *
+        * Normally, new chunk size is equal to mkfs one (One chunk)
+        * If it has multiple chunks, we just refuse to delete any one.
+        * As they are all single, so no real problem will happen.
+        * So only use condition 1) and 2) to judge them.
+        */
+       if (used != 0)
+               return 0;
+       switch (flag_type) {
+       case BTRFS_BLOCK_GROUP_DATA:
+       case BTRFS_BLOCK_GROUP_DATA | BTRFS_BLOCK_GROUP_METADATA:
+               data_profile &= BTRFS_BLOCK_GROUP_PROFILE_MASK;
+               if (flag_profile != data_profile)
+                       return 1;
+               break;
+       case BTRFS_BLOCK_GROUP_METADATA:
+               meta_profile &= BTRFS_BLOCK_GROUP_PROFILE_MASK;
+               if (flag_profile != meta_profile)
+                       return 1;
+               break;
+       case BTRFS_BLOCK_GROUP_SYSTEM:
+               sys_profile &= BTRFS_BLOCK_GROUP_PROFILE_MASK;
+               if (flag_profile != sys_profile)
+                       return 1;
+               break;
+       }
+       return 0;
+}
+
+/* Note: if current is a block group, it will skip it anyway */
+static int next_block_group(struct btrfs_root *root,
+                           struct btrfs_path *path)
+{
+       struct btrfs_key key;
+       int ret = 0;
+
+       while (1) {
+               ret = btrfs_next_item(root, path);
+               if (ret)
+                       goto out;
+
+               btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
+               if (key.type == BTRFS_BLOCK_GROUP_ITEM_KEY)
+                       goto out;
+       }
+out:
+       return ret;
+}
+
+/* This function will cleanup  */
+static int cleanup_temp_chunks(struct btrfs_fs_info *fs_info,
+                              struct mkfs_allocation *alloc,
+                              u64 data_profile, u64 meta_profile,
+                              u64 sys_profile)
+{
+       struct btrfs_trans_handle *trans = NULL;
+       struct btrfs_block_group_item *bgi;
+       struct btrfs_root *root = fs_info->extent_root;
+       struct btrfs_key key;
+       struct btrfs_key found_key;
+       struct btrfs_path *path;
+       int ret = 0;
+
+       path = btrfs_alloc_path();
+       if (!path) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       trans = btrfs_start_transaction(root, 1);
+
+       key.objectid = 0;
+       key.type = BTRFS_BLOCK_GROUP_ITEM_KEY;
+       key.offset = 0;
+
+       while (1) {
+               /*
+                * as the rest of the loop may modify the tree, we need to
+                * start a new search each time.
+                */
+               ret = btrfs_search_slot(trans, root, &key, path, 0, 0);
+               if (ret < 0)
+                       goto out;
+
+               btrfs_item_key_to_cpu(path->nodes[0], &found_key,
+                                     path->slots[0]);
+               if (found_key.objectid < key.objectid)
+                       goto out;
+               if (found_key.type != BTRFS_BLOCK_GROUP_ITEM_KEY) {
+                       ret = next_block_group(root, path);
+                       if (ret < 0)
+                               goto out;
+                       if (ret > 0) {
+                               ret = 0;
+                               goto out;
+                       }
+                       btrfs_item_key_to_cpu(path->nodes[0], &found_key,
+                                             path->slots[0]);
+               }
+
+               bgi = btrfs_item_ptr(path->nodes[0], path->slots[0],
+                                    struct btrfs_block_group_item);
+               if (is_temp_block_group(path->nodes[0], bgi,
+                                       data_profile, meta_profile,
+                                       sys_profile)) {
+                       u64 flags = btrfs_disk_block_group_flags(path->nodes[0],
+                                                            bgi);
+
+                       ret = btrfs_free_block_group(trans, fs_info,
+                                       found_key.objectid, found_key.offset);
+                       if (ret < 0)
+                               goto out;
+
+                       if ((flags & BTRFS_BLOCK_GROUP_TYPE_MASK) ==
+                           BTRFS_BLOCK_GROUP_DATA)
+                               alloc->data -= found_key.offset;
+                       else if ((flags & BTRFS_BLOCK_GROUP_TYPE_MASK) ==
+                                BTRFS_BLOCK_GROUP_METADATA)
+                               alloc->metadata -= found_key.offset;
+                       else if ((flags & BTRFS_BLOCK_GROUP_TYPE_MASK) ==
+                                BTRFS_BLOCK_GROUP_SYSTEM)
+                               alloc->system -= found_key.offset;
+                       else if ((flags & BTRFS_BLOCK_GROUP_TYPE_MASK) ==
+                                (BTRFS_BLOCK_GROUP_METADATA |
+                                 BTRFS_BLOCK_GROUP_DATA))
+                               alloc->mixed -= found_key.offset;
+               }
+               btrfs_release_path(path);
+               key.objectid = found_key.objectid + found_key.offset;
+       }
+out:
+       if (trans)
+               btrfs_commit_transaction(trans, root);
+       btrfs_free_path(path);
+       return ret;
+}
+
+int main(int argc, char **argv)
 {
        char *file;
        struct btrfs_root *root;
        struct btrfs_trans_handle *trans;
        char *label = NULL;
-       char *first_file;
        u64 block_count = 0;
        u64 dev_block_count = 0;
        u64 blocks[7];
@@ -1160,7 +1377,6 @@ int main(int ac, char **av)
        int discard = 1;
        int ssd = 0;
        int force_overwrite = 0;
-
        char *source_dir = NULL;
        int source_dir_set = 0;
        u64 num_of_meta_chunks = 0;
@@ -1168,10 +1384,10 @@ int main(int ac, char **av)
        u64 source_dir_size = 0;
        int dev_cnt = 0;
        int saved_optind;
-       char estr[100];
        char fs_uuid[BTRFS_UUID_UNPARSED_SIZE] = { 0 };
        u64 features = BTRFS_MKFS_DEFAULT_FEATURES;
        struct mkfs_allocation allocation = { 0 };
+       struct btrfs_mkfs_config mkfs_cfg;
 
        while(1) {
                int c;
@@ -1192,10 +1408,11 @@ int main(int ac, char **av)
                        { "features", required_argument, NULL, 'O' },
                        { "uuid", required_argument, NULL, 'U' },
                        { "quiet", 0, NULL, 'q' },
+                       { "help", no_argument, NULL, GETOPT_VAL_HELP },
                        { NULL, 0, NULL, 0}
                };
 
-               c = getopt_long(ac, av, "A:b:fl:n:s:m:d:L:O:r:U:VMKq",
+               c = getopt_long(argc, argv, "A:b:fl:n:s:m:d:L:O:r:U:VMKq",
                                long_options, NULL);
                if (c < 0)
                        break;
@@ -1251,8 +1468,6 @@ int main(int ac, char **av)
                                break;
                        case 'b':
                                block_count = parse_size(optarg);
-                               if (block_count <= BTRFS_MKFS_SMALL_VOLUME_SIZE)
-                                       mixed = 1;
                                zero_end = 0;
                                break;
                        case 'V':
@@ -1272,17 +1487,23 @@ int main(int ac, char **av)
                        case 'q':
                                verbose = 0;
                                break;
+                       case GETOPT_VAL_HELP:
                        default:
-                               print_usage();
+                               print_usage(c != GETOPT_VAL_HELP);
                }
        }
+
+       if (verbose) {
+               printf("%s\n", PACKAGE_STRING);
+               printf("See %s for more information.\n\n", PACKAGE_URL);
+       }
+
        sectorsize = max(sectorsize, (u32)sysconf(_SC_PAGESIZE));
-       if (btrfs_check_nodesize(nodesize, sectorsize))
-               exit(1);
+       stripesize = sectorsize;
        saved_optind = optind;
-       dev_cnt = ac - optind;
+       dev_cnt = argc - optind;
        if (dev_cnt == 0)
-               print_usage();
+               print_usage(1);
 
        if (source_dir_set && dev_cnt > 1) {
                fprintf(stderr,
@@ -1302,28 +1523,20 @@ int main(int ac, char **av)
                        exit(1);
                }
        }
-       
+
        while (dev_cnt-- > 0) {
-               file = av[optind++];
-               if (is_block_device(file))
-                       if (test_dev_for_mkfs(file, force_overwrite, estr)) {
-                               fprintf(stderr, "Error: %s", estr);
+               file = argv[optind++];
+               if (is_block_device(file) == 1)
+                       if (test_dev_for_mkfs(file, force_overwrite))
                                exit(1);
-                       }
        }
 
        optind = saved_optind;
-       dev_cnt = ac - optind;
+       dev_cnt = argc - optind;
 
-       file = av[optind++];
+       file = argv[optind++];
        ssd = is_ssd(file);
 
-       if (is_vol_small(file) || mixed) {
-               if (verbose)
-                       printf("SMALL VOLUME: forcing mixed metadata/data groups\n");
-               mixed = 1;
-       }
-
        /*
        * Set default profiles according to number of added devices.
        * For mixed groups defaults are single/single.
@@ -1354,18 +1567,26 @@ int main(int ac, char **av)
                        }
                }
 
-               if (!nodesize_forced) {
+               if (!nodesize_forced)
                        nodesize = best_nodesize;
-                       if (btrfs_check_nodesize(nodesize, sectorsize))
-                               exit(1);
-               }
-               if (nodesize != sectorsize) {
-                       fprintf(stderr, "Error: mixed metadata/data block groups "
-                               "require metadata blocksizes equal to the sectorsize\n");
-                       exit(1);
-               }
        }
 
+       /*
+        * FS features that can be set by other means than -O
+        * just set the bit here
+        */
+       if (mixed)
+               features |= BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS;
+
+       if ((data_profile | metadata_profile) &
+           (BTRFS_BLOCK_GROUP_RAID5 | BTRFS_BLOCK_GROUP_RAID6)) {
+               features |= BTRFS_FEATURE_INCOMPAT_RAID56;
+       }
+
+       if (btrfs_check_nodesize(nodesize, sectorsize,
+                                features))
+               exit(1);
+
        /* Check device/block_count after the nodesize is determined */
        if (block_count && block_count < btrfs_min_dev_size(nodesize)) {
                fprintf(stderr,
@@ -1379,7 +1600,7 @@ int main(int ac, char **av)
        for (i = saved_optind; i < saved_optind + dev_cnt; i++) {
                char *path;
 
-               path = av[i];
+               path = argv[i];
                ret = test_minimum_size(path, nodesize);
                if (ret < 0) {
                        fprintf(stderr, "Failed to check size for '%s': %s\n",
@@ -1397,17 +1618,9 @@ int main(int ac, char **av)
                }
        }
        ret = test_num_disk_vs_raid(metadata_profile, data_profile,
-                       dev_cnt, mixed, estr);
-       if (ret) {
-               fprintf(stderr, "Error: %s\n", estr);
+                       dev_cnt, mixed, ssd);
+       if (ret)
                exit(1);
-       }
-
-       /* if we are here that means all devs are good to btrfsify */
-       if (verbose) {
-               printf("%s\n", PACKAGE_STRING);
-               printf("See %s for more information.\n\n", PACKAGE_URL);
-       }
 
        dev_cnt--;
 
@@ -1423,9 +1636,11 @@ int main(int ac, char **av)
                                strerror(errno));
                        exit(1);
                }
-               first_file = file;
-               ret = btrfs_prepare_device(fd, file, zero_end, &dev_block_count,
-                                          block_count, &mixed, discard);
+               ret = btrfs_prepare_device(fd, file, &dev_block_count,
+                               block_count,
+                               (zero_end ? PREP_DEVICE_ZERO_END : 0) |
+                               (discard ? PREP_DEVICE_DISCARD : 0) |
+                               (verbose ? PREP_DEVICE_VERBOSE : 0));
                if (ret) {
                        close(fd);
                        exit(1);
@@ -1441,12 +1656,11 @@ int main(int ac, char **av)
                        exit(1);
                }
 
-               first_file = file;
                source_dir_size = size_sourcedir(source_dir, sectorsize,
                                             &num_of_meta_chunks, &size_of_data);
                if(block_count < source_dir_size)
                        block_count = source_dir_size;
-               ret = zero_output_file(fd, block_count, sectorsize);
+               ret = zero_output_file(fd, block_count);
                if (ret) {
                        fprintf(stderr, "unable to zero the output file\n");
                        exit(1);
@@ -1470,26 +1684,19 @@ int main(int ac, char **av)
        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");
        }
 
-       /*
-        * FS features that can be set by other means than -O
-        * just set the bit here
-        */
-       if (mixed)
-               features |= BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS;
-
-       if ((data_profile | metadata_profile) &
-           (BTRFS_BLOCK_GROUP_RAID5 | BTRFS_BLOCK_GROUP_RAID6)) {
-               features |= BTRFS_FEATURE_INCOMPAT_RAID56;
-       }
-
-       if (verbose)
-               btrfs_process_fs_features(features);
+       mkfs_cfg.label = label;
+       mkfs_cfg.fs_uuid = fs_uuid;
+       memcpy(mkfs_cfg.blocks, blocks, sizeof(blocks));
+       mkfs_cfg.num_bytes = dev_block_count;
+       mkfs_cfg.nodesize = nodesize;
+       mkfs_cfg.sectorsize = sectorsize;
+       mkfs_cfg.stripesize = stripesize;
+       mkfs_cfg.features = features;
 
-       ret = make_btrfs(fd, file, label, fs_uuid, blocks, dev_block_count,
-                        nodesize, sectorsize, stripesize, features);
+       ret = make_btrfs(fd, &mkfs_cfg, NULL);
        if (ret) {
                fprintf(stderr, "error during mkfs: %s\n", strerror(-ret));
                exit(1);
@@ -1503,24 +1710,46 @@ int main(int ac, char **av)
        }
        root->fs_info->alloc_start = alloc_start;
 
-       ret = make_root_dir(root, mixed, &allocation);
+       ret = create_metadata_block_groups(root, mixed, &allocation);
+       if (ret) {
+               fprintf(stderr, "failed to create default block groups\n");
+               exit(1);
+       }
+
+       trans = btrfs_start_transaction(root, 1);
+       if (!trans) {
+               fprintf(stderr, "failed to start transaction\n");
+               exit(1);
+       }
+
+       ret = create_data_block_groups(trans, root, mixed, &allocation);
+       if (ret) {
+               fprintf(stderr, "failed to create default data block groups\n");
+               exit(1);
+       }
+
+       ret = make_root_dir(trans, root, &allocation);
        if (ret) {
                fprintf(stderr, "failed to setup the root directory\n");
                exit(1);
        }
 
+       btrfs_commit_transaction(trans, root);
+
        trans = btrfs_start_transaction(root, 1);
+       if (!trans) {
+               fprintf(stderr, "failed to start transaction\n");
+               exit(1);
+       }
 
-       if (is_block_device(file))
+       if (is_block_device(file) == 1)
                btrfs_register_one_device(file);
 
        if (dev_cnt == 0)
                goto raid_groups;
 
        while (dev_cnt-- > 0) {
-               int old_mixed = mixed;
-
-               file = av[optind++];
+               file = argv[optind++];
 
                /*
                 * open without O_EXCL so that the problem should not
@@ -1541,13 +1770,15 @@ int main(int ac, char **av)
                        close(fd);
                        continue;
                }
-               ret = btrfs_prepare_device(fd, file, zero_end, &dev_block_count,
-                                          block_count, &mixed, discard);
+               ret = btrfs_prepare_device(fd, file, &dev_block_count,
+                               block_count,
+                               (verbose ? PREP_DEVICE_VERBOSE : 0) |
+                               (zero_end ? PREP_DEVICE_ZERO_END : 0) |
+                               (discard ? PREP_DEVICE_DISCARD : 0));
                if (ret) {
                        close(fd);
                        exit(1);
                }
-               mixed = old_mixed;
 
                ret = btrfs_add_to_fsid(trans, root, fd, file, dev_block_count,
                                        sectorsize, sectorsize, sectorsize);
@@ -1561,28 +1792,20 @@ int main(int ac, char **av)
                                (unsigned long long)device->devid);
                }
 
-               if (is_block_device(file))
+               if (is_block_device(file) == 1)
                        btrfs_register_one_device(file);
        }
 
 raid_groups:
        if (!source_dir_set) {
                ret = create_raid_groups(trans, root, data_profile,
-                                data_profile_opt, metadata_profile,
-                                mixed, &allocation);
+                                metadata_profile, mixed, &allocation);
                BUG_ON(ret);
        }
 
        ret = create_data_reloc_tree(trans, root);
        BUG_ON(ret);
 
-       if (verbose) {
-               printf(
-       "fs created label %s on %s\n\tnodesize %u leafsize %u sectorsize %u size %s\n",
-                   label, first_file, nodesize, nodesize, sectorsize,
-                   pretty_size(btrfs_super_total_bytes(root->fs_info->super_copy)));
-       }
-
        btrfs_commit_transaction(trans, root);
 
        if (source_dir_set) {
@@ -1596,9 +1819,50 @@ raid_groups:
                ret = make_image(source_dir, root, fd);
                BUG_ON(ret);
        }
+       ret = cleanup_temp_chunks(root->fs_info, &allocation, data_profile,
+                                 metadata_profile, metadata_profile);
+       if (ret < 0) {
+               fprintf(stderr, "Failed to cleanup temporary chunks\n");
+               goto out;
+       }
 
+       if (verbose) {
+               char features_buf[64];
+
+               printf("Label:              %s\n", label);
+               printf("UUID:               %s\n", fs_uuid);
+               printf("Node size:          %u\n", nodesize);
+               printf("Sector size:        %u\n", sectorsize);
+               printf("Filesystem size:    %s\n",
+                       pretty_size(btrfs_super_total_bytes(root->fs_info->super_copy)));
+               printf("Block group profiles:\n");
+               if (allocation.data)
+                       printf("  Data:             %-8s %16s\n",
+                               btrfs_group_profile_str(data_profile),
+                               pretty_size(allocation.data));
+               if (allocation.metadata)
+                       printf("  Metadata:         %-8s %16s\n",
+                               btrfs_group_profile_str(metadata_profile),
+                               pretty_size(allocation.metadata));
+               if (allocation.mixed)
+                       printf("  Data+Metadata:    %-8s %16s\n",
+                               btrfs_group_profile_str(data_profile),
+                               pretty_size(allocation.mixed));
+               printf("  System:           %-8s %16s\n",
+                       btrfs_group_profile_str(metadata_profile),
+                       pretty_size(allocation.system));
+               printf("SSD detected:       %s\n", ssd ? "yes" : "no");
+               btrfs_parse_features_to_string(features_buf, features);
+               printf("Incompat features:  %s", features_buf);
+               printf("\n");
+
+               list_all_devices(root);
+       }
+
+out:
        ret = close_ctree(root);
        BUG_ON(ret);
+       btrfs_close_all_devices();
        free(label);
        return 0;
 }