From patchwork Tue May 8 08:30: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: 10385677 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 54AA5602C2 for ; Tue, 8 May 2018 08:24:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45B51285AB for ; Tue, 8 May 2018 08:24:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3ABE428600; Tue, 8 May 2018 08:24:55 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, 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 A033D285AB for ; Tue, 8 May 2018 08:24:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933154AbeEHIYe (ORCPT ); Tue, 8 May 2018 04:24:34 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:42400 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933115AbeEHIYa (ORCPT ); Tue, 8 May 2018 04:24:30 -0400 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="39682958" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 08 May 2018 16:24:28 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id E22274B3ED60; Tue, 8 May 2018 16:24:27 +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; Tue, 8 May 2018 16:24:25 +0800 From: Su Yue To: CC: , Subject: [PATCH v5 07/16] btrfs-progs: lowmem: start to remove parameters @trans in lowmem Date: Tue, 8 May 2018 16:30:03 +0800 Message-ID: <20180508083012.12090-8-suy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508083012.12090-1-suy.fnst@cn.fujitsu.com> References: <20180508083012.12090-1-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.31] X-yoursite-MailScanner-ID: E22274B3ED60.ACA78 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 to be overwrited by excluding or 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". Such error will disappear after removing @trans finished. Signed-off-by: Su Yue --- check/mode-lowmem.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index c4e76113fa8a..cad131495c6f 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -2799,12 +2799,12 @@ out: * * 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; @@ -2821,6 +2821,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]; @@ -2859,9 +2860,20 @@ static int repair_extent_data_item(struct btrfs_trans_handle *trans, ret = -EIO; goto out; } + need_insert = ret; + ret = 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; @@ -2901,6 +2913,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]", @@ -4178,8 +4192,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: