From patchwork Thu Jan 11 07:35:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10157441 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 8522A601A1 for ; Thu, 11 Jan 2018 07:31:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 721EC286F1 for ; Thu, 11 Jan 2018 07:31:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67358286F5; Thu, 11 Jan 2018 07:31:43 +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 06F9C286F1 for ; Thu, 11 Jan 2018 07:31:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754176AbeAKHbO (ORCPT ); Thu, 11 Jan 2018 02:31:14 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:13569 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754147AbeAKHbM (ORCPT ); Thu, 11 Jan 2018 02:31:12 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35167960" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 11 Jan 2018 15:31:10 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 9816B48AEA12 for ; Thu, 11 Jan 2018 15:31:10 +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:08 +0800 From: Su Yue To: CC: Subject: [PATCH v3 09/17] btrfs-progs: lowmem check: start to remove parameters @trans in lowmem Date: Thu, 11 Jan 2018 15:35:03 +0800 Message-ID: <20180111073511.25288-10-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: 9816B48AEA12.AB9B7 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 Since extents can be avoid overwrite by excluding or new chunk allocation. It's unnessesary to do all repairs in one transaction. This patch removes parameter @trans of repair_extent_data_item(). repair_extent_data_item() 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 | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/cmds-check.c b/cmds-check.c index 341f73829ec7..cd8b6ed3898f 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -12164,18 +12164,19 @@ out: return err; } +static int try_avoid_extents_overwrite(struct btrfs_fs_info *fs_info); /* * If @err contains BACKREF_MISSING then add extent of the * file_extent_data_item. * * Returns error bits after reapir. */ -static int repair_extent_data_item(struct btrfs_trans_handle *trans, - struct btrfs_root *root, +static int repair_extent_data_item(struct btrfs_root *root, struct btrfs_path *pathp, struct node_refs *nrefs, int err) { + struct btrfs_trans_handle *trans = NULL; struct btrfs_file_extent_item *fi; struct btrfs_key fi_key; struct btrfs_key key; @@ -12192,6 +12193,7 @@ static int repair_extent_data_item(struct btrfs_trans_handle *trans, u64 file_offset; int generation; int slot; + int need_insert = 0; int ret = 0; eb = pathp->nodes[0]; @@ -12230,9 +12232,20 @@ static int repair_extent_data_item(struct btrfs_trans_handle *trans, ret = -EIO; goto out; } + need_insert = ret; + ret = try_avoid_extents_overwrite(root->fs_info); + if (ret) + goto out; + trans = btrfs_start_transaction(root, 1); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + trans = NULL; + error("fail to start transaction %s", strerror(-ret)); + goto out; + } /* insert an extent item */ - if (ret > 0) { + if (need_insert) { key.objectid = disk_bytenr; key.type = BTRFS_EXTENT_ITEM_KEY; key.offset = num_bytes; @@ -12272,6 +12285,8 @@ static int repair_extent_data_item(struct btrfs_trans_handle *trans, err &= ~BACKREF_MISSING; out: + if (trans) + btrfs_commit_transaction(trans, root); btrfs_release_path(&path); if (ret) error("can't repair root %llu extent data item[%llu %llu]", @@ -13545,8 +13560,7 @@ again: case BTRFS_EXTENT_DATA_KEY: ret = check_extent_data_item(root, path, nrefs, account_bytes); if (repair && ret) - ret = repair_extent_data_item(trans, root, path, nrefs, - ret); + ret = repair_extent_data_item(root, path, nrefs, ret); err |= ret; break; case BTRFS_BLOCK_GROUP_ITEM_KEY: