All of lore.kernel.org
 help / color / mirror / Atom feed
From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 04/25] btrfs-progs: convert: Read and build up used space tree
Date: Fri, 20 Nov 2015 11:24:08 +0800	[thread overview]
Message-ID: <1447989869-24739-5-git-send-email-quwenruo@cn.fujitsu.com> (raw)
In-Reply-To: <1447989869-24739-1-git-send-email-quwenruo@cn.fujitsu.com>

Before we do real convert, we'd better read and build up used space
cache tree for later data/meta chunk layout calculation.

This patch will iterate all used blocks in ext2 filesystem and record it
into mkfs_cfg.used cache tree for later used.

This provides the basis for later btrfs-convert rework.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
 btrfs-convert.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/btrfs-convert.c b/btrfs-convert.c
index f66affd..3bee049 100644
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -2286,6 +2286,77 @@ err:
 	return ret;
 }
 
+static int add_one_used_block(ext2_filsys fs, char *bitmap,
+			      unsigned long group_nr, struct cache_tree *used)
+{
+	unsigned long offset;
+	unsigned i;
+	int ret = 0;
+
+	offset = fs->super->s_first_data_block;
+	offset /= EXT2FS_CLUSTER_RATIO(fs);
+	offset += group_nr * fs->super->s_clusters_per_group;
+	for (i = 0; i < fs->super->s_clusters_per_group; i++) {
+		if (ext2fs_test_bit(i, bitmap)) {
+			u64 start;
+
+			start = (i + offset) * EXT2FS_CLUSTER_RATIO(fs);
+			start *= fs->blocksize;
+			ret = add_merge_cache_extent(used, start,
+						     fs->blocksize);
+			if (ret < 0)
+				break;
+		}
+	}
+	return ret;
+}
+
+/*
+ * This function will iterate through all the ext2 block groups to fill used
+ * space tree.
+ * Which will later be used to build data chunk layout to ensure all ext2 used
+ * data will be covered by data chunk.
+ */
+static int read_ext2_used_space(ext2_filsys fs, struct cache_tree *used_tree)
+{
+	blk64_t blk_itr = EXT2FS_B2C(fs, fs->super->s_first_data_block);
+	char *block_bitmap = NULL;
+	unsigned long i;
+	int block_nbytes;
+	int ret = 0;
+
+	block_nbytes = EXT2_CLUSTERS_PER_GROUP(fs->super) / 8;
+	ret = ext2fs_read_bitmaps(fs);
+	if (ret < 0)
+		return ret;
+	/* Shouldn't happen */
+	BUG_ON(!fs->block_map);
+
+	block_bitmap = malloc(block_nbytes);
+	if (!block_bitmap)
+		return -ENOMEM;
+
+	for (i = 0; i < fs->group_desc_count; i++) {
+		ret = ext2fs_get_block_bitmap_range2(fs->block_map, blk_itr,
+						block_nbytes * 8, block_bitmap);
+		if (ret) {
+			error("fail to get bitmap from ext2, %s",
+			      strerror(-ret));
+			break;
+		}
+		ret = add_one_used_block(fs, block_bitmap, i, used_tree);
+		if (ret < 0) {
+			error("fail to build used space tree, %s",
+			      strerror(-ret));
+			break;
+		}
+		blk_itr += fs->super->s_clusters_per_group;
+	}
+
+	free(block_bitmap);
+	return ret;
+}
+
 static int do_convert(const char *devname, int datacsum, int packing, int noxattr,
 		u32 nodesize, int copylabel, const char *fslabel, int progress,
 		u64 features)
@@ -2323,7 +2394,13 @@ static int do_convert(const char *devname, int datacsum, int packing, int noxatt
 	if (btrfs_check_nodesize(nodesize, blocksize, features))
 		goto fail;
 
+	/* Build the used space tree first */
 	init_mkfs_config(&mkfs_cfg);
+	ret = read_ext2_used_space(ext2_fs, &mkfs_cfg.convert_used);
+	if (ret < 0) {
+		error("fail to read ext2 block bitmap\n");
+		goto fail;
+	}
 
 	blocks_per_node = nodesize / blocksize;
 	ret = -blocks_per_node;
-- 
2.6.2


  parent reply	other threads:[~2015-11-20  3:26 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-20  3:24 [PATCH 00/25] Btrfs-convert rework to support native separate Qu Wenruo
2015-11-20  3:24 ` [PATCH 01/25] btrfs-progs: extent-cache: Add comments for search/lookup functions Qu Wenruo
2015-11-20  3:24 ` [PATCH 02/25] btrfs-progs: extent-tree: Add add_merge_cache_extent function Qu Wenruo
2015-11-20  3:24 ` [PATCH 03/25] btrfs-progs: Add new init/free function and member for mkfs_config Qu Wenruo
2015-11-20  3:24 ` Qu Wenruo [this message]
2015-11-20  3:24 ` [PATCH 05/25] btrfs-progs: utils: Introduce new function to remove reserved ranges Qu Wenruo
2015-11-20  3:24 ` [PATCH 06/25] btrfs-progs: utils: Introduce function to calculate the available space Qu Wenruo
2015-11-20  3:24 ` [PATCH 07/25] btrfs-progs: Reserve space for system/meta chunks and superblock Qu Wenruo
2015-11-20  3:24 ` [PATCH 08/25] btrfs-progs: Introduce function to setup temporary superblock Qu Wenruo
2015-11-20  3:24 ` [PATCH 09/25] btrfs-progs: Introduce function to setup temporary tree root Qu Wenruo
2015-11-20  3:24 ` [PATCH 10/25] btrfs-progs: Introduce function to setup temporary chunk root Qu Wenruo
2015-11-20  3:24 ` [PATCH 11/25] btrfs-progs: Introduce function to initialize device tree Qu Wenruo
2015-11-20  3:24 ` [PATCH 12/25] btrfs-progs: Introduce function to initialize fs tree Qu Wenruo
2015-11-20  3:24 ` [PATCH 13/25] btrfs-progs: Introduce function to initialize csum tree Qu Wenruo
2015-11-20  3:24 ` [PATCH 14/25] btrfs-progs: Introduce function to setup temporary extent tree Qu Wenruo
2015-11-20  3:24 ` [PATCH 15/25] btrfs-progs: Introduce function to create convert data chunks Qu Wenruo
2015-11-20  3:24 ` [PATCH 16/25] btrfs-progs: extent-tree: Introduce function to find the first overlap extent Qu Wenruo
2015-11-20  3:24 ` [PATCH 17/25] btrfs-progs: extent-tree: Enhance btrfs_record_file_extent Qu Wenruo
2015-11-20  3:24 ` [PATCH 18/25] btrfs-progs: convert: Introduce new function to create ext2 image Qu Wenruo
2015-11-20  3:24 ` [PATCH 19/25] btrfs-progs: convert: Introduce function to migrate reserved ranges Qu Wenruo
2015-11-20  3:24 ` [PATCH 20/25] btrfs-progs: Enhance record_file_blocks to handle " Qu Wenruo
2015-11-20  3:24 ` [PATCH 21/25] btrfs-progs: convert: Introduce init_btrfs_v2 function Qu Wenruo
2015-11-20  3:24 ` [PATCH 22/25] btrfs-progs: Introduce do_convert_v2 function Qu Wenruo
2015-11-20  3:24 ` [PATCH 23/25] btrfs-progs: Convert: Add support for rollback new convert behavior Qu Wenruo
2015-11-20  3:24 ` [PATCH 24/25] btrfs-progs: convert: Strictly avoid meta or system chunk allocation Qu Wenruo
2015-11-20  3:24 ` [PATCH 25/25] btrfs-progs: Cleanup old btrfs-convert Qu Wenruo
2015-11-23 17:33 ` [PATCH 00/25] Btrfs-convert rework to support native separate David Sterba
2015-11-24  0:53   ` Qu Wenruo
2015-11-24  8:50   ` Qu Wenruo
2015-11-25 12:42     ` David Sterba
2015-11-26  0:38       ` Qu Wenruo
2015-11-26  9:30         ` David Sterba
2015-11-26 10:12           ` Qu Wenruo
2015-11-26 14:42             ` David Sterba
2015-11-26 15:10             ` Jeff Mahoney

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=1447989869-24739-5-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.