btrfs-progs: add btrfs_clear_free_space_tree() from the kernel
[platform/upstream/btrfs-progs.git] / mkfs.c
diff --git a/mkfs.c b/mkfs.c
index c069d36..e501a93 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>
 #include "volumes.h"
 #include "transaction.h"
 #include "utils.h"
+#include "list_sort.h"
 
 static u64 index_cnt = 2;
 static int verbose = 1;
 
 struct directory_name_entry {
-       char *dir_name;
-       char *path;
+       const char *dir_name;
+       const char *path;
        ino_t inum;
        struct list_head list;
 };
 
-static int make_root_dir(struct btrfs_root *root, int mixed)
+struct mkfs_allocation {
+       u64 data;
+       u64 metadata;
+       u64 mixed;
+       u64 system;
+};
+
+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;
@@ -69,7 +78,9 @@ static int make_root_dir(struct btrfs_root *root, int mixed)
                                     BTRFS_BLOCK_GROUP_SYSTEM,
                                     BTRFS_FIRST_CHUNK_TREE_OBJECTID,
                                     0, BTRFS_MKFS_SYSTEM_GROUP_SIZE);
-       BUG_ON(ret);
+       allocation->system += BTRFS_MKFS_SYSTEM_GROUP_SIZE;
+       if (ret)
+               return ret;
 
        if (mixed) {
                ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
@@ -77,57 +88,82 @@ static int make_root_dir(struct btrfs_root *root, int mixed)
                                        BTRFS_BLOCK_GROUP_METADATA |
                                        BTRFS_BLOCK_GROUP_DATA);
                if (ret == -ENOSPC) {
-                       fprintf(stderr,
-                               "no space to alloc data/metadata chunk\n");
+                       error("no space to allocate data/metadata chunk");
                        goto err;
                }
-               BUG_ON(ret);
+               if (ret)
+                       return ret;
                ret = btrfs_make_block_group(trans, root, 0,
                                             BTRFS_BLOCK_GROUP_METADATA |
                                             BTRFS_BLOCK_GROUP_DATA,
                                             BTRFS_FIRST_CHUNK_TREE_OBJECTID,
                                             chunk_start, chunk_size);
-               BUG_ON(ret);
-               if (verbose)
-                       printf("Created a data/metadata chunk of size %llu\n",
-                                       chunk_size);
+               if (ret)
+                       return ret;
+               allocation->mixed += chunk_size;
        } else {
                ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
                                        &chunk_start, &chunk_size,
                                        BTRFS_BLOCK_GROUP_METADATA);
                if (ret == -ENOSPC) {
-                       fprintf(stderr, "no space to alloc metadata chunk\n");
+                       error("no space to allocate metadata chunk");
                        goto err;
                }
-               BUG_ON(ret);
+               if (ret)
+                       return ret;
                ret = btrfs_make_block_group(trans, root, 0,
                                             BTRFS_BLOCK_GROUP_METADATA,
                                             BTRFS_FIRST_CHUNK_TREE_OBJECTID,
                                             chunk_start, chunk_size);
-               BUG_ON(ret);
+               allocation->metadata += chunk_size;
+               if (ret)
+                       return ret;
        }
 
        root->fs_info->system_allocs = 0;
-       btrfs_commit_transaction(trans, root);
-       trans = btrfs_start_transaction(root, 1);
-       BUG_ON(!trans);
+       ret = btrfs_commit_transaction(trans, root);
+
+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");
+                       error("no space to allocate data chunk");
                        goto err;
                }
-               BUG_ON(ret);
+               if (ret)
+                       return ret;
                ret = btrfs_make_block_group(trans, root, 0,
                                             BTRFS_BLOCK_GROUP_DATA,
                                             BTRFS_FIRST_CHUNK_TREE_OBJECTID,
                                             chunk_start, chunk_size);
-               BUG_ON(ret);
+               allocation->data += chunk_size;
+               if (ret)
+                       return 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)
@@ -150,41 +186,60 @@ static int make_root_dir(struct btrfs_root *root, int mixed)
        if (ret)
                goto err;
 
-       btrfs_commit_transaction(trans, root);
 err:
        return ret;
 }
 
-static void __recow_root(struct btrfs_trans_handle *trans,
+static int __recow_root(struct btrfs_trans_handle *trans,
                         struct btrfs_root *root)
 {
-       int ret;
        struct extent_buffer *tmp;
+       int ret;
 
        if (trans->transid != btrfs_root_generation(&root->root_item)) {
                extent_buffer_get(root->node);
                ret = __btrfs_cow_block(trans, root, root->node,
                                        NULL, 0, &tmp, 0, 0);
-               BUG_ON(ret);
+               if (ret)
+                       return ret;
                free_extent_buffer(tmp);
        }
+
+       return 0;
 }
 
-static void recow_roots(struct btrfs_trans_handle *trans,
+static int recow_roots(struct btrfs_trans_handle *trans,
                       struct btrfs_root *root)
 {
        struct btrfs_fs_info *info = root->fs_info;
+       int ret;
+
+       ret = __recow_root(trans, info->fs_root);
+       if (ret)
+               return ret;
+       ret = __recow_root(trans, info->tree_root);
+       if (ret)
+               return ret;
+       ret = __recow_root(trans, info->extent_root);
+       if (ret)
+               return ret;
+       ret = __recow_root(trans, info->chunk_root);
+       if (ret)
+               return ret;
+       ret = __recow_root(trans, info->dev_root);
+       if (ret)
+               return ret;
+       ret = __recow_root(trans, info->csum_root);
+       if (ret)
+               return ret;
 
-       __recow_root(trans, info->fs_root);
-       __recow_root(trans, info->tree_root);
-       __recow_root(trans, info->extent_root);
-       __recow_root(trans, info->chunk_root);
-       __recow_root(trans, info->dev_root);
-       __recow_root(trans, info->csum_root);
+       return 0;
 }
 
 static int create_one_raid_group(struct btrfs_trans_handle *trans,
-                             struct btrfs_root *root, u64 type)
+                             struct btrfs_root *root, u64 type,
+                             struct mkfs_allocation *allocation)
+
 {
        u64 chunk_start;
        u64 chunk_size;
@@ -193,23 +248,40 @@ static int create_one_raid_group(struct btrfs_trans_handle *trans,
        ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
                                &chunk_start, &chunk_size, type);
        if (ret == -ENOSPC) {
-               fprintf(stderr, "not enough free space\n");
+               error("not enough free space to allocate chunk");
                exit(1);
        }
-       BUG_ON(ret);
+       if (ret)
+               return ret;
+
        ret = btrfs_make_block_group(trans, root->fs_info->extent_root, 0,
                                     type, BTRFS_FIRST_CHUNK_TREE_OBJECTID,
                                     chunk_start, chunk_size);
-       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;
 }
 
 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) {
@@ -217,26 +289,29 @@ static int create_raid_groups(struct btrfs_trans_handle *trans,
 
                ret = create_one_raid_group(trans, root,
                                            BTRFS_BLOCK_GROUP_SYSTEM |
-                                           metadata_profile);
-               BUG_ON(ret);
+                                           metadata_profile, allocation);
+               if (ret)
+                       return ret;
 
                if (mixed)
                        meta_flags |= BTRFS_BLOCK_GROUP_DATA;
 
                ret = create_one_raid_group(trans, root, meta_flags |
-                                           metadata_profile);
-               BUG_ON(ret);
+                                           metadata_profile, allocation);
+               if (ret)
+                       return 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);
-               BUG_ON(ret);
+                                           data_profile, allocation);
+               if (ret)
+                       return ret;
        }
-       recow_roots(trans, root);
+       ret = recow_roots(trans, root);
 
-       return 0;
+       return ret;
 }
 
 static int create_data_reloc_tree(struct btrfs_trans_handle *trans,
@@ -249,7 +324,8 @@ static int create_data_reloc_tree(struct btrfs_trans_handle *trans,
        int ret;
 
        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));
        btrfs_set_root_bytenr(&root_item, tmp->start);
@@ -262,46 +338,42 @@ static int create_data_reloc_tree(struct btrfs_trans_handle *trans,
        location.offset = 0;
        ret = btrfs_insert_root(trans, root->fs_info->tree_root,
                                &location, &root_item);
-       BUG_ON(ret);
-       return 0;
-}
-
 
-static void print_usage(void) __attribute__((noreturn));
-static void print_usage(void)
-{
-       fprintf(stderr, "usage: mkfs.btrfs [options] dev [ dev ... ]\n");
-       fprintf(stderr, "options:\n");
-       fprintf(stderr, "\t-A|--alloc-start START  the offset to start the FS\n");
-       fprintf(stderr, "\t-b|--byte-count SIZE    total number of bytes in the FS\n");
-       fprintf(stderr, "\t-d|--data PROFILE       data profile, raid0, raid1, raid5, raid6, raid10, dup or single\n");
-       fprintf(stderr, "\t-f|--force              force overwrite of existing filesystem\n");
-       fprintf(stderr, "\t-l|--leafsize SIZE      deprecated, alias for nodesize\n");
-       fprintf(stderr, "\t-L|--label LABEL        set a label\n");
-       fprintf(stderr, "\t-m|--metadata PROFILE   metadata profile, values like data profile\n");
-       fprintf(stderr, "\t-M|--mixed              mix metadata and data together\n");
-       fprintf(stderr, "\t-n|--nodesize SIZE      size of btree nodes\n");
-       fprintf(stderr, "\t-s|--sectorsize SIZE    min block allocation (may not mountable by current kernel)\n");
-       fprintf(stderr, "\t-r|--rootdir DIR        the source directory\n");
-       fprintf(stderr, "\t-K|--nodiscard          do not perform whole device TRIM\n");
-       fprintf(stderr, "\t-O|--features LIST      comma separated list of filesystem features, use '-O list-all' to list features\n");
-       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);
+       return ret;
 }
 
-static void print_version(void) __attribute__((noreturn));
-static void print_version(void)
+static void print_usage(int ret)
 {
-       fprintf(stderr, "mkfs.btrfs, part of %s\n", PACKAGE_STRING);
-       exit(0);
+       printf("Usage: mkfs.btrfs [options] dev [ dev ... ]\n");
+       printf("Options:\n");
+       printf("  allocation profiles:\n");
+       printf("\t-d|--data PROFILE       data profile, raid0, raid1, raid5, raid6, raid10, dup or single\n");
+       printf("\t-m|--metadata PROFILE   metadata profile, values like for data profile\n");
+       printf("\t-M|--mixed              mix metadata and data together\n");
+       printf("  features:\n");
+       printf("\t-n|--nodesize SIZE      size of btree nodes\n");
+       printf("\t-s|--sectorsize SIZE    data block size (may not be mountable by current kernel)\n");
+       printf("\t-O|--features LIST      comma separated list of filesystem features (use '-O list-all' to list features)\n");
+       printf("\t-L|--label LABEL        set the filesystem label\n");
+       printf("\t-U|--uuid UUID          specify the filesystem UUID (must be unique)\n");
+       printf("  creation:\n");
+       printf("\t-b|--byte-count SIZE    set filesystem size to SIZE (on the first device)\n");
+       printf("\t-r|--rootdir DIR        copy files from DIR to the image root directory\n");
+       printf("\t-K|--nodiscard          do not perform whole device TRIM\n");
+       printf("\t-f|--force              force overwrite of existing filesystem\n");
+       printf("  general:\n");
+       printf("\t-q|--quiet              no messages except errors\n");
+       printf("\t-V|--version            print the mkfs.btrfs version and exit\n");
+       printf("\t--help                  print this help and exit\n");
+       printf("  deprecated:\n");
+       printf("\t-A|--alloc-start START  the offset to start the filesytem\n");
+       printf("\t-l|--leafsize SIZE      deprecated, alias for nodesize\n");
+       exit(ret);
 }
 
-static u64 parse_profile(char *s)
+static u64 parse_profile(const 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;
@@ -316,19 +388,19 @@ static u64 parse_profile(char *s)
        } else if (strcasecmp(s, "single") == 0) {
                return 0;
        } else {
-               fprintf(stderr, "Unknown profile %s\n", s);
-               print_usage();
+               error("unknown profile %s", s);
+               exit(1);
        }
        /* not reached */
        return 0;
 }
 
-static char *parse_label(char *input)
+static char *parse_label(const char *input)
 {
        int len = strlen(input);
 
        if (len >= BTRFS_LABEL_SIZE) {
-               fprintf(stderr, "Label %s is too long (max %d)\n", input,
+               error("label %s is too long (max %d)", input,
                        BTRFS_LABEL_SIZE - 1);
                exit(1);
        }
@@ -349,7 +421,7 @@ static int add_directory_items(struct btrfs_trans_handle *trans,
 
        location.objectid = objectid;
        location.offset = 0;
-       btrfs_set_key_type(&location, BTRFS_INODE_ITEM_KEY);
+       location.type = BTRFS_INODE_ITEM_KEY;
 
        if (S_ISDIR(st->st_mode))
                filetype = BTRFS_FT_DIR;
@@ -428,11 +500,11 @@ static int fill_inode_item(struct btrfs_trans_handle *trans,
 
 static int directory_select(const struct direct *entry)
 {
-       if ((strncmp(entry->d_name, ".", entry->d_reclen) == 0) ||
-               (strncmp(entry->d_name, "..", entry->d_reclen) == 0))
+       if (entry->d_name[0] == '.' &&
+               (entry->d_name[1] == 0 ||
+                (entry->d_name[1] == '.' && entry->d_name[2] == 0)))
                return 0;
-       else
-               return 1;
+       return 1;
 }
 
 static void free_namelist(struct direct **files, int count)
@@ -447,7 +519,7 @@ static void free_namelist(struct direct **files, int count)
        free(files);
 }
 
-static u64 calculate_dir_inode_size(char *dirname)
+static u64 calculate_dir_inode_size(const char *dirname)
 {
        int count, i;
        struct direct **files, *cur_file;
@@ -468,12 +540,11 @@ static u64 calculate_dir_inode_size(char *dirname)
 
 static int add_inode_items(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root,
-                          struct stat *st, char *name,
+                          struct stat *st, const char *name,
                           u64 self_objectid, ino_t parent_inum,
                           int dir_index_cnt, struct btrfs_inode_item *inode_ret)
 {
        int ret;
-       struct btrfs_key inode_key;
        struct btrfs_inode_item btrfs_inode;
        u64 objectid;
        u64 inode_size = 0;
@@ -486,10 +557,6 @@ static int add_inode_items(struct btrfs_trans_handle *trans,
                btrfs_set_stack_inode_size(&btrfs_inode, inode_size);
        }
 
-       inode_key.objectid = objectid;
-       inode_key.offset = 0;
-       btrfs_set_key_type(&inode_key, BTRFS_INODE_ITEM_KEY);
-
        ret = btrfs_insert_inode(trans, root, objectid, &btrfs_inode);
 
        *inode_ret = btrfs_inode;
@@ -512,8 +579,8 @@ static int add_xattr_item(struct btrfs_trans_handle *trans,
        if (ret < 0) {
                if(errno == ENOTSUP)
                        return 0;
-               fprintf(stderr, "get a list of xattr failed for %s\n",
-                       file_name);
+               error("getting a list of xattr failed for %s: %s", file_name,
+                               strerror(errno));
                return ret;
        }
        if (ret == 0)
@@ -528,8 +595,8 @@ static int add_xattr_item(struct btrfs_trans_handle *trans,
                if (ret < 0) {
                        if(errno == ENOTSUP)
                                return 0;
-                       fprintf(stderr, "get a xattr value failed for %s attr %s\n",
-                               file_name, cur_name);
+                       error("gettig a xattr value failed for %s attr %s: %s",
+                               file_name, cur_name, strerror(errno));
                        return ret;
                }
 
@@ -537,8 +604,8 @@ static int add_xattr_item(struct btrfs_trans_handle *trans,
                                              cur_name_len, cur_value,
                                              ret, objectid);
                if (ret) {
-                       fprintf(stderr, "insert a xattr item failed for %s\n",
-                               file_name);
+                       error("inserting a xattr item failed for %s: %s",
+                                       file_name, strerror(-ret));
                }
 
                cur_name = strtok(next_location, &delimiter);
@@ -552,16 +619,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);
+               error("readlink failed for %s: %s", path_name, strerror(errno));
                goto fail;
        }
-       if (ret >= sectorsize) {
-               fprintf(stderr, "symlink too long for %s", path_name);
+       if (ret >= sizeof(buf)) {
+               error("symlink too long for %s", path_name);
                ret = -1;
                goto fail;
        }
@@ -570,7 +636,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;
 }
 
@@ -598,7 +663,7 @@ static int add_file_items(struct btrfs_trans_handle *trans,
 
        fd = open(path_name, O_RDONLY);
        if (fd == -1) {
-               fprintf(stderr, "%s open failed\n", path_name);
+               error("cannot open %s: %s", path_name, strerror(errno));
                return ret;
        }
 
@@ -608,9 +673,18 @@ 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);
+                       error("cannot read %s at offset %llu length %llu: %s",
+                               path_name, (unsigned long long)bytes_read,
+                               (unsigned long long)st->st_size,
+                               strerror(errno));
                        free(buffer);
                        goto end;
                }
@@ -628,12 +702,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:
 
@@ -656,7 +729,11 @@ again:
 
                ret_read = pread64(fd, eb->data, sectorsize, file_pos + bytes_read);
                if (ret_read == -1) {
-                       fprintf(stderr, "%s read failed\n", path_name);
+                       error("cannot read %s at offset %llu length %llu: %s",
+                               path_name,
+                               (unsigned long long)file_pos + bytes_read,
+                               (unsigned long long)sectorsize,
+                               strerror(errno));
                        goto end;
                }
 
@@ -676,7 +753,7 @@ again:
 
                ret = write_and_map_eb(trans, root, eb);
                if (ret) {
-                       fprintf(stderr, "output file write failed\n");
+                       error("failed to write %s", path_name);
                        goto end;
                }
 
@@ -703,7 +780,7 @@ end:
        return ret;
 }
 
-static char *make_path(char *dir, char *name)
+static char *make_path(const char *dir, const char *name)
 {
        char *path;
 
@@ -718,7 +795,7 @@ static char *make_path(char *dir, char *name)
 }
 
 static int traverse_directory(struct btrfs_trans_handle *trans,
-                             struct btrfs_root *root, char *dir_name,
+                             struct btrfs_root *root, const char *dir_name,
                              struct directory_name_entry *dir_head, int out_fd)
 {
        int ret = 0;
@@ -732,7 +809,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
        struct direct *cur_file;
        ino_t parent_inum, cur_inum;
        ino_t highest_inum = 0;
-       char *parent_dir_name;
+       const char *parent_dir_name;
        char real_path[PATH_MAX];
        struct btrfs_path path;
        struct extent_buffer *leaf;
@@ -741,10 +818,12 @@ 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) {
-               fprintf(stderr, "get directory real path error\n");
+               error("realpath  failed for %s: %s", dir_name, strerror(errno));
                ret = -1;
                goto fail_no_dir;
        }
@@ -757,10 +836,10 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
 
        root_dir_key.objectid = btrfs_root_dirid(&root->root_item);
        root_dir_key.offset = 0;
-       btrfs_set_key_type(&root_dir_key, BTRFS_INODE_ITEM_KEY);
+       root_dir_key.type = BTRFS_INODE_ITEM_KEY;
        ret = btrfs_lookup_inode(trans, root, &path, &root_dir_key, 1);
        if (ret) {
-               fprintf(stderr, "root dir lookup error\n");
+               error("failed to lookup root dir: %d", ret);
                goto fail_no_dir;
        }
 
@@ -783,8 +862,8 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
                parent_inum = parent_dir_entry->inum;
                parent_dir_name = parent_dir_entry->dir_name;
                if (chdir(parent_dir_entry->path)) {
-                       fprintf(stderr, "chdir error for %s\n",
-                               parent_dir_name);
+                       error("chdir failed for %s: %s",
+                               parent_dir_name, strerror(errno));
                        ret = -1;
                        goto fail_no_files;
                }
@@ -793,7 +872,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
                                directory_select, NULL);
                if (count == -1)
                {
-                       fprintf(stderr, "scandir for %s failed: %s\n",
+                       error("scandir failed for %s: %s",
                                parent_dir_name, strerror (errno));
                        ret = -1;
                        goto fail;
@@ -803,8 +882,8 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
                        cur_file = files[i];
 
                        if (lstat(cur_file->d_name, &st) == -1) {
-                               fprintf(stderr, "lstat failed for file %s\n",
-                                       cur_file->d_name);
+                               error("lstat failed for %s: %s",
+                                       cur_file->d_name, strerror(errno));
                                ret = -1;
                                goto fail;
                        }
@@ -815,7 +894,8 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
                                                  cur_file->d_name,
                                                  &st, &dir_index_cnt);
                        if (ret) {
-                               fprintf(stderr, "add_directory_items failed\n");
+                               error("unable to add directory items for %s: %d",
+                                       cur_file->d_name, ret);
                                goto fail;
                        }
 
@@ -824,24 +904,36 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
                                              parent_inum, dir_index_cnt,
                                              &cur_inode);
                        if (ret == -EEXIST) {
-                               BUG_ON(st.st_nlink <= 1);
+                               if (st.st_nlink <= 1) {
+                                       error(
+                       "item %s already exists but has wrong st_nlink %lu <= 1",
+                                               cur_file->d_name,
+                                               (unsigned long)st.st_nlink);
+                                       goto fail;
+                               }
                                continue;
                        }
                        if (ret) {
-                               fprintf(stderr, "add_inode_items failed\n");
+                               error("unable to add inode items for %s: %d",
+                                       cur_file->d_name, ret);
                                goto fail;
                        }
 
                        ret = add_xattr_item(trans, root,
                                             cur_inum, cur_file->d_name);
                        if (ret) {
-                               fprintf(stderr, "add_xattr_item failed\n");
+                               error("unable to add xattr items for %s: %d",
+                                       cur_file->d_name, ret);
                                if(ret != -ENOTSUP)
                                        goto fail;
                        }
 
                        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);
@@ -852,14 +944,16 @@ static int traverse_directory(struct btrfs_trans_handle *trans,
                                                     cur_inum, parent_inum, &st,
                                                     cur_file->d_name, out_fd);
                                if (ret) {
-                                       fprintf(stderr, "add_file_items failed\n");
+                                       error("unable to add file items for %s: %d",
+                                               cur_file->d_name, ret);
                                        goto fail;
                                }
                        } else if (S_ISLNK(st.st_mode)) {
                                ret = add_symbolic_link(trans, root,
                                                        cur_inum, cur_file->d_name);
                                if (ret) {
-                                       fprintf(stderr, "add_symbolic_link failed\n");
+                                       error("unable to add symlink for %s: %d",
+                                               cur_file->d_name, ret);
                                        goto fail;
                                }
                        }
@@ -884,18 +978,10 @@ fail_no_dir:
        goto out;
 }
 
-static int open_target(char *output_name)
-{
-       int output_fd;
-       output_fd = open(output_name, O_CREAT | O_RDWR | O_TRUNC,
-                        S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
-
-       return output_fd;
-}
-
 static int create_chunks(struct btrfs_trans_handle *trans,
                         struct btrfs_root *root, u64 num_of_meta_chunks,
-                        u64 size_of_data)
+                        u64 size_of_data,
+                        struct mkfs_allocation *allocation)
 {
        u64 chunk_start;
        u64 chunk_size;
@@ -908,11 +994,14 @@ static int create_chunks(struct btrfs_trans_handle *trans,
        for (i = 0; i < num_of_meta_chunks; i++) {
                ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root,
                                        &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,
                                             meta_type, BTRFS_FIRST_CHUNK_TREE_OBJECTID,
                                             chunk_start, chunk_size);
-               BUG_ON(ret);
+               allocation->metadata += chunk_size;
+               if (ret)
+                       return ret;
                set_extent_dirty(&root->fs_info->free_space_cache,
                                 chunk_start, chunk_start + chunk_size - 1, 0);
        }
@@ -921,31 +1010,33 @@ 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);
-       BUG_ON(ret);
+                                    &chunk_start, size_of_data, data_type, 0);
+       if (ret)
+               return ret;
        ret = btrfs_make_block_group(trans, root->fs_info->extent_root, 0,
                                     data_type, BTRFS_FIRST_CHUNK_TREE_OBJECTID,
                                     chunk_start, size_of_data);
-       BUG_ON(ret);
+       allocation->data += size_of_data;
+       if (ret)
+               return ret;
        set_extent_dirty(&root->fs_info->free_space_cache,
                         chunk_start, chunk_start + size_of_data - 1, 0);
        return ret;
 }
 
-static int make_image(char *source_dir, struct btrfs_root *root, int out_fd)
+static int make_image(const char *source_dir, struct btrfs_root *root,
+               int out_fd)
 {
        int ret;
        struct btrfs_trans_handle *trans;
-
        struct stat root_st;
-
        struct directory_name_entry dir_head;
-
        struct directory_name_entry *dir_entry = NULL;
 
        ret = lstat(source_dir, &root_st);
        if (ret) {
-               fprintf(stderr, "unable to lstat the %s\n", source_dir);
+               error("unable to lstat %s: %s", source_dir, strerror(errno));
+               ret = -errno;
                goto out;
        }
 
@@ -954,10 +1045,14 @@ static int make_image(char *source_dir, struct btrfs_root *root, int out_fd)
        trans = btrfs_start_transaction(root, 1);
        ret = traverse_directory(trans, root, source_dir, &dir_head, out_fd);
        if (ret) {
-               fprintf(stderr, "unable to traverse_directory\n");
+               error("unable to traverse directory %s: %d", source_dir, ret);
                goto fail;
        }
-       btrfs_commit_transaction(trans, root);
+       ret = btrfs_commit_transaction(trans, root);
+       if (ret) {
+               error("transaction commit failed: %d", ret);
+               goto out;
+       }
 
        if (verbose)
                printf("Making image is completed.\n");
@@ -970,29 +1065,27 @@ fail:
                free(dir_entry);
        }
 out:
-       fprintf(stderr, "Making image is aborted.\n");
-       return -1;
+       return ret;
 }
 
 /*
  * 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;
 }
 
-static u64 size_sourcedir(char *dir_name, u64 sectorsize,
+static u64 size_sourcedir(const char *dir_name, u64 sectorsize,
                          u64 *num_of_meta_chunks_ret, u64 *size_of_data_ret)
 {
        u64 dir_size = 0;
@@ -1007,11 +1100,12 @@ 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) {
-               fprintf(stderr, "ftw subdir walk of '%s' failed: %s\n",
-                       dir_name, strerror(errno));
+               error("ftw subdir walk of %s failed: %s", dir_name,
+                       strerror(errno));
                exit(1);
        }
 
@@ -1035,32 +1129,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;
@@ -1096,22 +1187,214 @@ static int is_ssd(const char *file)
                return 0;
        }
 
-       if (read(fd, &rotational, sizeof(char)) < sizeof(char)) {
+       if (read(fd, &rotational, 1) < 1) {
                close(fd);
                return 0;
        }
        close(fd);
 
-       return !atoi((const char *)&rotational);
+       return rotational == '0';
+}
+
+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;
 }
 
-int main(int ac, char **av)
+/* 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;
+
+       btrfs_init_path(&path);
+       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_release_path(&path);
+       return ret;
+}
+
+int main(int argc, char **argv)
 {
        char *file;
        struct btrfs_root *root;
+       struct btrfs_fs_info *fs_info;
        struct btrfs_trans_handle *trans;
        char *label = NULL;
-       char *first_file;
        u64 block_count = 0;
        u64 dev_block_count = 0;
        u64 blocks[7];
@@ -1133,7 +1416,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;
@@ -1141,9 +1423,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 = NULL;
+       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;
@@ -1164,10 +1447,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;
@@ -1183,8 +1467,7 @@ int main(int ac, char **av)
                                data_profile_opt = 1;
                                break;
                        case 'l':
-                               fprintf(stderr,
-                       "WARNING: --leafsize is deprecated, use --nodesize\n");
+                               warning("--leafsize is deprecated, use --nodesize");
                        case 'n':
                                nodesize = parse_size(optarg);
                                nodesize_forced = 1;
@@ -1205,8 +1488,7 @@ int main(int ac, char **av)
 
                                tmp = btrfs_parse_fs_features(tmp, &features);
                                if (tmp) {
-                                       fprintf(stderr,
-                                               "Unrecognized filesystem feature '%s'\n",
+                                       error("unrecognized filesystem feature '%s'",
                                                        tmp);
                                        free(orig);
                                        exit(1);
@@ -1223,19 +1505,20 @@ 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':
-                               print_version();
+                               printf("mkfs.btrfs, part of %s\n",
+                                               PACKAGE_STRING);
+                               exit(0);
                                break;
                        case 'r':
                                source_dir = optarg;
                                source_dir_set = 1;
                                break;
                        case 'U':
-                               fs_uuid = optarg;
+                               strncpy(fs_uuid, optarg,
+                                       BTRFS_UUID_UNPARSED_SIZE - 1);
                                break;
                        case 'K':
                                discard = 0;
@@ -1243,58 +1526,55 @@ 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,
-                       "The -r option is limited to a single device\n");
+               error("the option -r is limited to a single device");
                exit(1);
        }
 
-       if (fs_uuid) {
+       if (*fs_uuid) {
                uuid_t dummy_uuid;
 
                if (uuid_parse(fs_uuid, dummy_uuid) != 0) {
-                       fprintf(stderr, "could not parse UUID: %s\n", fs_uuid);
+                       error("could not parse UUID: %s", fs_uuid);
                        exit(1);
                }
                if (!test_uuid_unique(fs_uuid)) {
-                       fprintf(stderr, "non-unique UUID: %s\n", fs_uuid);
+                       error("non-unique UUID: %s", fs_uuid);
                        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.
@@ -1319,66 +1599,68 @@ int main(int ac, char **av)
 
                if (metadata_profile_opt || data_profile_opt) {
                        if (metadata_profile != data_profile) {
-                               fprintf(stderr,
-       "ERROR: With mixed block groups data and metadata profiles must be the same\n");
+                               error(
+       "with mixed block groups data and metadata profiles must be the same");
                                exit(1);
                        }
                }
 
-               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);
+
+       if (sectorsize < sizeof(struct btrfs_super_block)) {
+               error("sectorsize smaller than superblock: %u < %zu",
+                               sectorsize, sizeof(struct btrfs_super_block));
+               exit(1);
        }
 
        /* Check device/block_count after the nodesize is determined */
        if (block_count && block_count < btrfs_min_dev_size(nodesize)) {
-               fprintf(stderr,
-                       "Size '%llu' is too small to make a usable filesystem\n",
+               error("size %llu is too small to make a usable filesystem",
                        block_count);
-               fprintf(stderr,
-                       "Minimum size for btrfs filesystem is %llu\n",
+               error("minimum size for btrfs filesystem is %llu",
                        btrfs_min_dev_size(nodesize));
                exit(1);
        }
        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",
+                       error("failed to check size for %s: %s",
                                path, strerror(-ret));
                        exit (1);
                }
                if (ret > 0) {
-                       fprintf(stderr,
-                               "'%s' is too small to make a usable filesystem\n",
+                       error("'%s' is too small to make a usable filesystem",
                                path);
-                       fprintf(stderr,
-                               "Minimum size for each btrfs device is %llu.\n",
+                       error("minimum size for each btrfs device is %llu",
                                btrfs_min_dev_size(nodesize));
                        exit(1);
                }
        }
        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--;
 
@@ -1390,36 +1672,40 @@ int main(int ac, char **av)
                 */
                fd = open(file, O_RDWR);
                if (fd < 0) {
-                       fprintf(stderr, "unable to open %s: %s\n", file,
-                               strerror(errno));
+                       error("unable to open %s: %s", file, 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);
                }
                if (block_count && block_count > dev_block_count) {
-                       fprintf(stderr, "%s is smaller than requested size\n", file);
+                       error("%s is smaller than requested size, expected %llu, found %llu",
+                                       file,
+                                       (unsigned long long)block_count,
+                                       (unsigned long long)dev_block_count);
                        exit(1);
                }
        } else {
-               fd = open_target(file);
+               fd = open(file, O_CREAT | O_RDWR,
+                               S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
                if (fd < 0) {
-                       fprintf(stderr, "unable to open the %s\n", file);
+                       error("unable to open %s: %s", file, strerror(errno));
                        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");
+                       error("unable to zero the output file");
                        exit(1);
                }
                /* our "device" is the new image file */
@@ -1428,7 +1714,8 @@ int main(int ac, char **av)
 
        /* To create the first block group and chunk 0 in make_btrfs */
        if (dev_block_count < BTRFS_MKFS_SYSTEM_GROUP_SIZE) {
-               fprintf(stderr, "device is too small to make filesystem\n");
+               error("device is too small to make filesystem, must be at least %llu",
+                               (unsigned long long)BTRFS_MKFS_SYSTEM_GROUP_SIZE);
                exit(1);
        }
 
@@ -1440,58 +1727,75 @@ 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");
        }
 
-       /*
-        * FS features that can be set by other means than -O
-        * just set the bit here
-        */
-       if (mixed)
-               features |= BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS;
+       mkfs_cfg.label = label;
+       memcpy(mkfs_cfg.fs_uuid, fs_uuid, sizeof(mkfs_cfg.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;
 
-       if ((data_profile | metadata_profile) &
-           (BTRFS_BLOCK_GROUP_RAID5 | BTRFS_BLOCK_GROUP_RAID6)) {
-               features |= BTRFS_FEATURE_INCOMPAT_RAID56;
+       ret = make_btrfs(fd, &mkfs_cfg, NULL);
+       if (ret) {
+               error("error during mkfs: %s", strerror(-ret));
+               exit(1);
        }
 
-       if (verbose)
-               btrfs_process_fs_features(features);
+       fs_info = open_ctree_fs_info(file, 0, 0, 0,
+                       OPEN_CTREE_WRITES | OPEN_CTREE_FS_PARTIAL);
+       if (!fs_info) {
+               error("open ctree failed");
+               close(fd);
+               exit(1);
+       }
+       root = fs_info->fs_root;
+       fs_info->alloc_start = alloc_start;
 
-       ret = make_btrfs(fd, file, label, fs_uuid, blocks, dev_block_count,
-                        nodesize, sectorsize, stripesize, features);
+       ret = create_metadata_block_groups(root, mixed, &allocation);
        if (ret) {
-               fprintf(stderr, "error during mkfs: %s\n", strerror(-ret));
+               error("failed to create default block groups: %d", ret);
                exit(1);
        }
 
-       root = open_ctree(file, 0, OPEN_CTREE_WRITES);
-       if (!root) {
-               fprintf(stderr, "Open ctree failed\n");
-               close(fd);
+       trans = btrfs_start_transaction(root, 1);
+       if (!trans) {
+               error("failed to start transaction");
                exit(1);
        }
-       root->fs_info->alloc_start = alloc_start;
 
-       ret = make_root_dir(root, mixed);
+       ret = create_data_block_groups(trans, root, mixed, &allocation);
        if (ret) {
-               fprintf(stderr, "failed to setup the root directory\n");
+               error("failed to create default data block groups: %d", ret);
                exit(1);
        }
 
-       trans = btrfs_start_transaction(root, 1);
+       ret = make_root_dir(trans, root, &allocation);
+       if (ret) {
+               error("failed to setup the root directory: %d", ret);
+               exit(1);
+       }
 
-       if (is_block_device(file))
-               btrfs_register_one_device(file);
+       ret = btrfs_commit_transaction(trans, root);
+       if (ret) {
+               error("unable to commit transaction: %d", ret);
+               goto out;
+       }
+
+       trans = btrfs_start_transaction(root, 1);
+       if (!trans) {
+               error("failed to start transaction");
+               exit(1);
+       }
 
        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
@@ -1500,75 +1804,146 @@ int main(int ac, char **av)
                 */
                fd = open(file, O_RDWR);
                if (fd < 0) {
-                       fprintf(stderr, "unable to open %s: %s\n", file,
-                               strerror(errno));
+                       error("unable to open %s: %s", file, strerror(errno));
                        exit(1);
                }
                ret = btrfs_device_already_in_root(root, fd,
                                                   BTRFS_SUPER_INFO_OFFSET);
                if (ret) {
-                       fprintf(stderr, "skipping duplicate device %s in FS\n",
+                       error("skipping duplicate device %s in the filesystem",
                                file);
                        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);
-               BUG_ON(ret);
+               if (ret) {
+                       error("unable to add %s to filesystem: %d", file, ret);
+                       goto out;
+               }
                if (verbose >= 2) {
                        struct btrfs_device *device;
 
-                       device = container_of(root->fs_info->fs_devices->devices.next,
+                       device = container_of(fs_info->fs_devices->devices.next,
                                        struct btrfs_device, dev_list);
                        printf("adding device %s id %llu\n", file,
                                (unsigned long long)device->devid);
                }
-
-               if (is_block_device(file))
-                       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);
-               BUG_ON(ret);
+                                metadata_profile, mixed, &allocation);
+               if (ret) {
+                       error("unable to create raid groups: %d", ret);
+                       goto out;
+               }
        }
 
        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)));
+       if (ret) {
+               error("unable to create data reloc tree: %d", ret);
+               goto out;
        }
 
-       btrfs_commit_transaction(trans, root);
+       ret = btrfs_commit_transaction(trans, root);
+       if (ret) {
+               error("unable to commit transaction: %d", ret);
+               goto out;
+       }
 
        if (source_dir_set) {
                trans = btrfs_start_transaction(root, 1);
                ret = create_chunks(trans, root,
-                                   num_of_meta_chunks, size_of_data);
-               BUG_ON(ret);
-               btrfs_commit_transaction(trans, root);
+                                   num_of_meta_chunks, size_of_data,
+                                   &allocation);
+               if (ret) {
+                       error("unable to create chunks: %d", ret);
+                       goto out;
+               }
+               ret = btrfs_commit_transaction(trans, root);
+               if (ret) {
+                       error("transaction commit failed: %d", ret);
+                       goto out;
+               }
 
                ret = make_image(source_dir, root, fd);
-               BUG_ON(ret);
+               if (ret) {
+                       error("error wihle filling filesystem: %d", ret);
+                       goto out;
+               }
+       }
+       ret = cleanup_temp_chunks(fs_info, &allocation, data_profile,
+                                 metadata_profile, metadata_profile);
+       if (ret < 0) {
+               error("failed to cleanup temporary chunks: %d", ret);
+               goto out;
        }
 
+       if (verbose) {
+               char features_buf[64];
+
+               printf("Label:              %s\n", label);
+               printf("UUID:               %s\n", mkfs_cfg.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(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);
+       }
+
+       /*
+        * The filesystem is now fully set up, commit the remaining changes and
+        * fix the signature as the last step before closing the devices.
+        */
+       fs_info->finalize_on_close = 1;
+out:
        ret = close_ctree(root);
-       BUG_ON(ret);
+
+       if (!ret) {
+               optind = saved_optind;
+               dev_cnt = argc - optind;
+               while (dev_cnt-- > 0) {
+                       file = argv[optind++];
+                       if (is_block_device(file) == 1)
+                               btrfs_register_one_device(file);
+               }
+       }
+
+       btrfs_close_all_devices();
        free(label);
-       return 0;
+
+       return !!ret;
 }