File 0010-btrfs-progs-Introduce-function-to-initialize-fs-tree.patch of Package btrfsprogs.11414
From: Qu Wenruo <quwenruo@cn.fujitsu.com>
Date: Fri, 29 Jan 2016 13:03:19 +0800
Subject: btrfs-progs: Introduce function to initialize fs tree
Git-commit: b2da12034aa1a7bea1b7999b4cc7db862392fae0
Patch-mainline: v4.6
References: bsc#1042369
Introudce new function, setup_temp_fs_tree(), to setup temporary fs tree
for make_btrfs_v2().
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---
utils.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/utils.c b/utils.c
index fff188b..36209df 100644
--- a/utils.c
+++ b/utils.c
@@ -653,6 +653,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().
*
@@ -748,6 +770,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.12.3