From patchwork Fri Jan 29 05:03:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 8158931 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 92624BEEE5 for ; Fri, 29 Jan 2016 05:16:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA09320361 for ; Fri, 29 Jan 2016 05:16:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5D47200DE for ; Fri, 29 Jan 2016 05:16:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751992AbcA2FQs (ORCPT ); Fri, 29 Jan 2016 00:16:48 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:34115 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751867AbcA2FQq (ORCPT ); Fri, 29 Jan 2016 00:16:46 -0500 X-IronPort-AV: E=Sophos;i="5.20,367,1444665600"; d="scan'208";a="304662" Received: from unknown (HELO cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 29 Jan 2016 13:05:46 +0800 Received: from localhost.localdomain (unknown [10.167.226.34]) by cn.fujitsu.com (Postfix) with ESMTP id BB0404056414; Fri, 29 Jan 2016 13:05:34 +0800 (CST) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, David Sterba Subject: [PATCH v3 18/22] btrfs-progs: convert: Introduce init_btrfs_v2 function. Date: Fri, 29 Jan 2016 13:03:28 +0800 Message-Id: <1454043812-7893-19-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454043812-7893-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1454043812-7893-1-git-send-email-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-yoursite-MailScanner-ID: BB0404056414.AA2BB X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Introduce new init_btrfs_v2() function for later newer do_convert(). Since we have good enough chunk allocation, a lot of wired chunk hack won't ever be used. We only need to insert data chunks and create needed subvolume. Signed-off-by: Qu Wenruo Signed-off-by: David Sterba --- btrfs-convert.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/btrfs-convert.c b/btrfs-convert.c index 8956a86..ce6c59b 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -2302,6 +2302,67 @@ static int make_convert_data_block_groups(struct btrfs_trans_handle *trans, return ret; } +/* + * Init the temp btrfs to a operational status. + * + * It will fix the extent usage accounting(XXX: Do we really need?) and + * insert needed data chunks, to ensure all old fs data extents are covered + * by DATA chunks, preventing wrong chunks are allocated. + * + * And also create convert image subvolume and relocation tree. + * (XXX: Not need again?) + * But the convert image subvolume is *NOT* linked to fs tree yet. + */ +static int init_btrfs_v2(struct btrfs_mkfs_config *cfg, struct btrfs_root *root, + struct btrfs_convert_context *cctx, int datacsum, + int packing, int noxattr) +{ + struct btrfs_key location; + struct btrfs_trans_handle *trans; + struct btrfs_fs_info *fs_info = root->fs_info; + int ret; + + trans = btrfs_start_transaction(root, 1); + BUG_ON(!trans); + ret = btrfs_fix_block_accounting(trans, root); + if (ret) + goto err; + ret = make_convert_data_block_groups(trans, fs_info, cfg, cctx); + if (ret) + goto err; + ret = btrfs_make_root_dir(trans, fs_info->tree_root, + BTRFS_ROOT_TREE_DIR_OBJECTID); + if (ret) + goto err; + memcpy(&location, &root->root_key, sizeof(location)); + location.offset = (u64)-1; + ret = btrfs_insert_dir_item(trans, fs_info->tree_root, "default", 7, + btrfs_super_root_dir(fs_info->super_copy), + &location, BTRFS_FT_DIR, 0); + if (ret) + goto err; + ret = btrfs_insert_inode_ref(trans, fs_info->tree_root, "default", 7, + location.objectid, + btrfs_super_root_dir(fs_info->super_copy), 0); + if (ret) + goto err; + btrfs_set_root_dirid(&fs_info->fs_root->root_item, + BTRFS_FIRST_FREE_OBJECTID); + + /* subvol for fs image file */ + ret = create_subvol(trans, root, CONV_IMAGE_SUBVOL_OBJECTID); + if (ret < 0) + goto err; + /* subvol for data relocation tree */ + ret = create_subvol(trans, root, BTRFS_DATA_RELOC_TREE_OBJECTID); + if (ret < 0) + goto err; + + ret = btrfs_commit_transaction(trans, root); +err: + return ret; +} + static int init_btrfs(struct btrfs_root *root) { int ret;