From patchwork Wed Nov 18 07:22:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 7645521 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 497AABF90C for ; Wed, 18 Nov 2015 07:26:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4ED0D2053B for ; Wed, 18 Nov 2015 07:26:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5899820603 for ; Wed, 18 Nov 2015 07:26:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754620AbbKRH0c (ORCPT ); Wed, 18 Nov 2015 02:26:32 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:23505 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753789AbbKRHYj (ORCPT ); Wed, 18 Nov 2015 02:24:39 -0500 X-IronPort-AV: E=Sophos;i="5.20,242,1444665600"; d="scan'208";a="573346" Received: from bogon (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by heian.cn.fujitsu.com with ESMTP; 18 Nov 2015 15:24:25 +0800 Received: from localhost.localdomain (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id tAI7NoRx007932 for ; Wed, 18 Nov 2015 15:23:53 +0800 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [RFC PATCH 04/22] btrfs-progs: convert: Read and build up used space tree Date: Wed, 18 Nov 2015 15:22:04 +0800 Message-Id: <1447831342-15056-5-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1447831342-15056-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1447831342-15056-1-git-send-email-quwenruo@cn.fujitsu.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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;