search for: make_root_dir

...igned-off-by: Liu Bo <bo.li.liu@oracle.com> --- mkfs.c | 23 +++++++++++++++-------- volumes.c | 16 +++++++++++----- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/mkfs.c b/mkfs.c index 7ff60e5..e3789cc 100644 --- a/mkfs.c +++ b/mkfs.c @@ -74,31 +74,36 @@ 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); + if (ret) + goto err; if (mixed) { ret = btrfs_alloc_chunk(trans, root->fs_info->extent_root, &chunk...

Here are 3 patches to avoid undesired aborts of mkfs.btrfs. These are based on top of Chris''s btrfs-progs.git: git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git Thanks, H.Seto Hidetoshi Seto (3): btrfs-progs: error if device for mkfs is too small btrfs-progs: error if device have no space to make primary chunks btrfs-progs: calculate available

...61 100644 --- a/mkfs.c +++ b/mkfs.c @@ -456,7 +456,7 @@ int main(int ac, char **av) fprintf(stderr, "error during mkfs %d\n", ret); exit(1); } - root = open_ctree(file, 0, O_RDWR); + root = open_ctree(file, 0, O_RDWR, 1); root->fs_info->alloc_start = alloc_start; ret = make_root_dir(root); diff --git a/utils.c b/utils.c index 2f4c6e1..60c3f24 100644 --- a/utils.c +++ b/utils.c @@ -31,6 +31,8 @@ #include <fcntl.h> #include <unistd.h> #include <mntent.h> +#include <linux/loop.h> +#include <limits.h> #include "kerncompat.h" #include &q...