From patchwork Wed Dec 20 04:57:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10124983 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 C6EE260390 for ; Wed, 20 Dec 2017 04:53:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF71328E2D for ; Wed, 20 Dec 2017 04:53:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B45E3291FC; Wed, 20 Dec 2017 04:53:59 +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 6157028E2D for ; Wed, 20 Dec 2017 04:53:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754468AbdLTEx5 (ORCPT ); Tue, 19 Dec 2017 23:53:57 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:17266 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754484AbdLTExt (ORCPT ); Tue, 19 Dec 2017 23:53:49 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="31879410" Received: from localhost (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 20 Dec 2017 12:53:47 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 1A50948AE9EA; Wed, 20 Dec 2017 12:53:48 +0800 (CST) Received: from archlinux.g08.fujitsu.local (10.167.226.31) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Wed, 20 Dec 2017 12:53:46 +0800 From: Su Yue To: CC: , Subject: [PATCH v2 15/17] btrfs-progs: lowmem check: remove parameter @trans of check_btrfs_root() Date: Wed, 20 Dec 2017 12:57:29 +0800 Message-ID: <20171220045731.19343-16-suy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171220045731.19343-1-suy.fnst@cn.fujitsu.com> References: <20171220045731.19343-1-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.31] X-yoursite-MailScanner-ID: 1A50948AE9EA.ABAA2 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(). Signed-off-by: Su Yue --- cmds-check.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/cmds-check.c b/cmds-check.c index 90270f1f8f72..81e125b9315f 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -2705,8 +2705,7 @@ static int check_leaf_items(struct btrfs_root *root, struct btrfs_path *path, * Returns <0 Fatal error, must exit the whole check * Returns 0 No errors found */ -static int walk_down_tree_v2(struct btrfs_trans_handle *trans, - struct btrfs_root *root, struct btrfs_path *path, +static int walk_down_tree_v2(struct btrfs_root *root, struct btrfs_path *path, int *level, struct node_refs *nrefs, int ext_ref, int check_all) @@ -6580,8 +6579,7 @@ static struct data_backref *find_data_backref(struct extent_record *rec, * 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) { @@ -6627,8 +6625,8 @@ static int check_btrfs_root(struct btrfs_trans_handle *trans, } while (1) { - ret = walk_down_tree_v2(trans, root, &path, &level, &nrefs, - ext_ref, check_all); + ret = walk_down_tree_v2(root, &path, &level, &nrefs, ext_ref, + check_all); if (ret > 0) err |= ret; @@ -6663,7 +6661,7 @@ out: static int check_fs_root_v2(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); } /* @@ -13709,11 +13707,11 @@ static int check_chunks_and_extents_v2(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); @@ -13744,7 +13742,7 @@ static int check_chunks_and_extents_v2(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)