All of lore.kernel.org
 help / color / mirror / Atom feed
From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: linux-btrfs@vger.kernel.org
Subject: [RFC PATCH 11/22] btrfs-progs: Introduce function to initialize device tree
Date: Wed, 18 Nov 2015 15:22:11 +0800	[thread overview]
Message-ID: <1447831342-15056-12-git-send-email-quwenruo@cn.fujitsu.com> (raw)
In-Reply-To: <1447831342-15056-1-git-send-email-quwenruo@cn.fujitsu.com>

Introduce new function, setup_temp_device_tree(), to setup temporary
device tree for make_btrfs_v2().

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
 utils.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/utils.c b/utils.c
index a91b70c..3be484a 100644
--- a/utils.c
+++ b/utils.c
@@ -787,6 +787,59 @@ out:
 	return ret;
 }
 
+static void insert_temp_dev_extent(struct extent_buffer *buf,
+				   int *slot, u32 *itemoff, u64 start, u64 len)
+{
+	struct btrfs_dev_extent *dev_extent;
+	struct btrfs_disk_key disk_key;
+
+	btrfs_set_header_nritems(buf, *slot + 1);
+	(*itemoff) -= sizeof(*dev_extent);
+	btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_EXTENT_KEY);
+	btrfs_set_disk_key_objectid(&disk_key, 1);
+	btrfs_set_disk_key_offset(&disk_key, start);
+	btrfs_set_item_key(buf, &disk_key, *slot);
+	btrfs_set_item_offset(buf, btrfs_item_nr(*slot), *itemoff);
+	btrfs_set_item_size(buf, btrfs_item_nr(*slot), sizeof(*dev_extent));
+
+	dev_extent = btrfs_item_ptr(buf, *slot, struct btrfs_dev_extent);
+	btrfs_set_dev_extent_chunk_objectid(buf, dev_extent,
+					    BTRFS_FIRST_CHUNK_TREE_OBJECTID);
+	btrfs_set_dev_extent_length(buf, dev_extent, len);
+	btrfs_set_dev_extent_chunk_offset(buf, dev_extent, start);
+	btrfs_set_dev_extent_chunk_tree(buf, dev_extent,
+					BTRFS_CHUNK_TREE_OBJECTID);
+	(*slot)++;
+}
+
+static int setup_temp_dev_tree(int fd, struct btrfs_mkfs_config *cfg,
+			       u64 sys_chunk_start, u64 meta_chunk_start,
+			       u64 dev_bytenr)
+{
+	struct extent_buffer *buf = NULL;
+	u32 itemoff = __BTRFS_LEAF_DATA_SIZE(cfg->nodesize);
+	int slot = 0;
+	int ret;
+
+	/* Must ensure SYS chunk starts before META chunk */
+	BUG_ON(meta_chunk_start < sys_chunk_start);
+	buf = malloc(sizeof(*buf) + cfg->nodesize);
+	if (!buf)
+		return -ENOMEM;
+	ret = setup_temp_extent_buffer(buf, cfg, dev_bytenr,
+				       BTRFS_DEV_TREE_OBJECTID);
+	if (ret < 0)
+		goto out;
+	insert_temp_dev_extent(buf, &slot, &itemoff, sys_chunk_start,
+			       BTRFS_MKFS_SYSTEM_GROUP_SIZE);
+	insert_temp_dev_extent(buf, &slot, &itemoff, meta_chunk_start,
+			       BTRFS_CONVERT_META_GROUP_SIZE);
+	ret = write_temp_extent_buffer(fd, buf, dev_bytenr);
+out:
+	free(buf);
+	return ret;
+}
+
 /*
  * Improved version of make_btrfs().
  *
@@ -879,7 +932,8 @@ static int make_btrfs_v2(int fd, struct btrfs_mkfs_config *cfg)
 				    chunk_bytenr);
 	if (ret < 0)
 		goto out;
-
+	ret = setup_temp_dev_tree(fd, cfg, sys_chunk_start, meta_chunk_start,
+				  dev_bytenr);
 out:
 	free(free_tree);
 	return ret;
-- 
2.6.2


  parent reply	other threads:[~2015-11-18  7:24 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-18  7:22 [RFC PATCH 00/22] Btrfs-convert rework part 1 Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 01/22] btrfs-progs: extent-cache: Add comments for search/lookup functions Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 02/22] btrfs-progs: extent-tree: Add add_merge_cache_extent function Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 03/22] btrfs-progs: Add new init/free function and member for mkfs_config Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 04/22] btrfs-progs: convert: Read and build up used space tree Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 05/22] btrfs-progs: utils: Introduce new function to remove reserved ranges Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 06/22] btrfs-progs: utils: Introduce function to calculate the available space Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 07/22] btrfs-progs: Reserve space for system/meta chunks and superblock Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 08/22] btrfs-progs: Introduce function to setup temporary superblock Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 09/22] btrfs-progs: Introduce function to setup temporary tree root Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 10/22] btrfs-progs: Introduce function to setup temporary chunk root Qu Wenruo
2015-11-18  7:22 ` Qu Wenruo [this message]
2015-11-18  7:22 ` [RFC PATCH 12/22] btrfs-progs: Introduce function to initialize fs tree Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 13/22] btrfs-progs: Introduce function to initialize csum tree Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 14/22] btrfs-progs: Introduce function to setup temporary extent tree Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 15/22] btrfs-progs: Introduce function to create convert data chunks Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 16/22] btrfs-progs: extent-tree: Introduce function to find the first overlap extent Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 17/22] btrfs-progs: extent-tree: Enhance btrfs_record_file_extent Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 18/22] btrfs-progs: convert: Introduce new function to create ext2 image Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 19/22] btrfs-progs: convert: Introduce function to migrate reserved ranges Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 20/22] btrfs-progs: Enhance record_file_blocks to handle " Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 21/22] btrfs-progs: convert: Introduce init_btrfs_v2 function Qu Wenruo
2015-11-18  7:22 ` [RFC PATCH 22/22] btrfs-progs: Introduce do_convert_v2 function Qu Wenruo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447831342-15056-12-git-send-email-quwenruo@cn.fujitsu.com \
    --to=quwenruo@cn.fujitsu.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.