From b2da12034aa1a7bea1b7999b4cc7db862392fae0 Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Fri, 29 Jan 2016 13:03:19 +0800 Subject: [PATCH] btrfs-progs: Introduce function to initialize fs tree Introudce new function, setup_temp_fs_tree(), to setup temporary fs tree for make_btrfs_v2(). Signed-off-by: Qu Wenruo Signed-off-by: David Sterba --- utils.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/utils.c b/utils.c index c782a7a..08ff2f5 100644 --- a/utils.c +++ b/utils.c @@ -656,6 +656,28 @@ out: return ret; } +static int setup_temp_fs_tree(int fd, struct btrfs_mkfs_config *cfg, + u64 fs_bytenr) +{ + struct extent_buffer *buf = NULL; + int ret; + + buf = malloc(sizeof(*buf) + cfg->nodesize); + if (!buf) + return -ENOMEM; + ret = setup_temp_extent_buffer(buf, cfg, fs_bytenr, + BTRFS_FS_TREE_OBJECTID); + if (ret < 0) + goto out; + /* + * Temporary fs tree is completely empty. + */ + ret = write_temp_extent_buffer(fd, buf, fs_bytenr); +out: + free(buf); + return ret; +} + /* * Improved version of make_btrfs(). * @@ -751,6 +773,10 @@ static int make_convert_btrfs(int fd, struct btrfs_mkfs_config *cfg, goto out; ret = setup_temp_dev_tree(fd, cfg, sys_chunk_start, meta_chunk_start, dev_bytenr); + if (ret < 0) + goto out; + ret = setup_temp_fs_tree(fd, cfg, fs_bytenr); + out: return ret; } -- 2.7.4