From patchwork Thu Jan 11 07:35:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10157427 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2E826601A1 for ; Thu, 11 Jan 2018 07:31:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D6DF286F1 for ; Thu, 11 Jan 2018 07:31:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1238A286F5; Thu, 11 Jan 2018 07:31:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 65EF6286F1 for ; Thu, 11 Jan 2018 07:31:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932160AbeAKHbV (ORCPT ); Thu, 11 Jan 2018 02:31:21 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:41663 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932107AbeAKHbS (ORCPT ); Thu, 11 Jan 2018 02:31:18 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35167972" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 11 Jan 2018 15:31:16 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 98F9748AEA0C for ; Thu, 11 Jan 2018 15:31:14 +0800 (CST) Received: from archlinux.g08.fujitsu.local (10.167.226.31) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Thu, 11 Jan 2018 15:31:12 +0800 From: Su Yue To: CC: Subject: [PATCH v3 11/17] btrfs-progs: lowmem check: remove parameter @trans of repair_chunk_item() Date: Thu, 11 Jan 2018 15:35:05 +0800 Message-ID: <20180111073511.25288-12-suy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111073511.25288-1-suy.fnst@cn.fujitsu.com> References: <20180111073511.25288-1-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.31] X-yoursite-MailScanner-ID: 98F9748AEA0C.AC427 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: suy.fnst@cn.fujitsu.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch removes parameter @trans of repair_chunk_item(). It calls try_avoid_extents_overwrite() and starts a transaction by itself. Note: This patch and next patches cause error in lowmem repair like: "Error: Commit_root already set when starting transaction". This error will disappear after removing @trans finished. Signed-off-by: Su Yue --- cmds-check.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/cmds-check.c b/cmds-check.c index aebae43c1fa7..15cc628092c2 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -13350,13 +13350,14 @@ out: * * Returns error after repair. */ -static int repair_chunk_item(struct btrfs_trans_handle *trans, - struct btrfs_root *chunk_root, +static int repair_chunk_item(struct btrfs_root *chunk_root, struct btrfs_path *path, int err) { struct btrfs_chunk *chunk; struct btrfs_key chunk_key; struct extent_buffer *eb = path->nodes[0]; + struct btrfs_root *extent_root = chunk_root->fs_info->extent_root; + struct btrfs_trans_handle *trans; u64 length; int slot = path->slots[0]; u64 type; @@ -13369,21 +13370,36 @@ static int repair_chunk_item(struct btrfs_trans_handle *trans, type = btrfs_chunk_type(path->nodes[0], chunk); length = btrfs_chunk_length(eb, chunk); - if (err & REFERENCER_MISSING) { - ret = btrfs_make_block_group(trans, chunk_root->fs_info, 0, - type, chunk_key.objectid, chunk_key.offset, length); - if (ret) { - error("fail to add block group item[%llu %llu]", - chunk_key.offset, length); - goto out; - } else { - err &= ~REFERENCER_MISSING; - printf("Added block group item[%llu %llu]\n", - chunk_key.offset, length); - } + /* now repair only adds block group */ + if ((err & REFERENCER_MISSING) == 0) + return err; + + ret = try_avoid_extents_overwrite(chunk_root->fs_info); + if (ret) + return ret; + + trans = btrfs_start_transaction(extent_root, 1); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + error("fail to start transaction %s", strerror(-ret)); + return ret; } -out: + ret = btrfs_make_block_group(trans, chunk_root->fs_info, 0, type, + chunk_key.objectid, chunk_key.offset, length); + if (ret) { + error("fail to add block group item[%llu %llu]", + chunk_key.offset, length); + } else { + err &= ~REFERENCER_MISSING; + printf("Added block group item[%llu %llu]\n", chunk_key.offset, + length); + } + + btrfs_commit_transaction(trans, extent_root); + if (ret) + error("fail to repair item(s) related to chunk item[%llu %llu]", + chunk_key.objectid, chunk_key.offset); return err; } @@ -13587,7 +13603,7 @@ again: case BTRFS_CHUNK_ITEM_KEY: ret = check_chunk_item(fs_info, eb, slot); if (repair && ret) - ret = repair_chunk_item(trans, root, path, ret); + ret = repair_chunk_item(root, path, ret); err |= ret; break; case BTRFS_DEV_EXTENT_KEY: