From patchwork Thu Feb 8 03:27:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10206575 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 503BA60247 for ; Thu, 8 Feb 2018 03:23:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42913291B1 for ; Thu, 8 Feb 2018 03:23:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 375A629319; Thu, 8 Feb 2018 03:23:38 +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 AB749291B1 for ; Thu, 8 Feb 2018 03:23:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752239AbeBHDXg (ORCPT ); Wed, 7 Feb 2018 22:23:36 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:3171 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752193AbeBHDXV (ORCPT ); Wed, 7 Feb 2018 22:23:21 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="36914192" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 08 Feb 2018 11:23:20 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 584D248AE767 for ; Thu, 8 Feb 2018 11:23:19 +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, 8 Feb 2018 11:23:18 +0800 From: Su Yue To: CC: Subject: [PATCH v4 15/18] btrfs-progs: lowmem check: remove parameter @trans of check_btrfs_root() Date: Thu, 8 Feb 2018 11:27:34 +0800 Message-ID: <20180208032737.31561-16-suy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180208032737.31561-1-suy.fnst@cn.fujitsu.com> References: <20180208032737.31561-1-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.31] X-yoursite-MailScanner-ID: 584D248AE767.AA890 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 Remove parameters @trans of delete_extent_item() and walk_down_tree_v2(). 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 --- check/mode-lowmem.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index d4c8de4e69af..d92278d2993c 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -4271,8 +4271,7 @@ out: * Returns <0 Fatal error, must exit the whole check * Returns 0 No errors found */ -static int walk_down_tree(struct btrfs_trans_handle *trans, - struct btrfs_root *root, struct btrfs_path *path, +static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path, int *level, struct node_refs *nrefs, int ext_ref, int check_all) { @@ -4585,8 +4584,7 @@ out: * Returns 0 represents OK. * Returns >0 represents error bits. */ -static int check_btrfs_root(struct btrfs_trans_handle *trans, - struct btrfs_root *root, unsigned int ext_ref, +static int check_btrfs_root(struct btrfs_root *root, unsigned int ext_ref, int check_all) { struct btrfs_path path; @@ -4631,7 +4629,7 @@ static int check_btrfs_root(struct btrfs_trans_handle *trans, } while (1) { - ret = walk_down_tree(trans, root, &path, &level, &nrefs, + ret = walk_down_tree(root, &path, &level, &nrefs, ext_ref, check_all); if (ret > 0) @@ -4667,7 +4665,7 @@ out: static int check_fs_root(struct btrfs_root *root, unsigned int ext_ref) { reset_cached_block_groups(root->fs_info); - return check_btrfs_root(NULL, root, ext_ref, 0); + return check_btrfs_root(root, ext_ref, 0); } /* @@ -4871,11 +4869,11 @@ int check_chunks_and_extents_lowmem(struct btrfs_fs_info *fs_info) } root1 = root->fs_info->chunk_root; - ret = check_btrfs_root(trans, root1, 0, 1); + ret = check_btrfs_root(root1, 0, 1); err |= ret; root1 = root->fs_info->tree_root; - ret = check_btrfs_root(trans, root1, 0, 1); + ret = check_btrfs_root(root1, 0, 1); err |= ret; btrfs_init_path(&path); @@ -4906,7 +4904,7 @@ int check_chunks_and_extents_lowmem(struct btrfs_fs_info *fs_info) goto next; } - ret = check_btrfs_root(trans, cur_root, 0, 1); + ret = check_btrfs_root(cur_root, 0, 1); err |= ret; if (key.objectid == BTRFS_TREE_RELOC_OBJECTID)