From patchwork Wed Dec 20 04:57:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10124999 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 BA8DF60390 for ; Wed, 20 Dec 2017 04:54:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B306228E2D for ; Wed, 20 Dec 2017 04:54:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8273291FC; Wed, 20 Dec 2017 04:54:15 +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 595B628E2D for ; Wed, 20 Dec 2017 04:54:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754546AbdLTEyN (ORCPT ); Tue, 19 Dec 2017 23:54:13 -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 S1754429AbdLTExx (ORCPT ); Tue, 19 Dec 2017 23:53:53 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="31879419" Received: from localhost (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 20 Dec 2017 12:53:48 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 5A14448AEA0B; Wed, 20 Dec 2017 12:53:49 +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:48 +0800 From: Su Yue To: CC: , Subject: [PATCH v2 17/17] btrfs-progs: lowmem check: end of removing parameters @trans in lowmem Date: Wed, 20 Dec 2017 12:57:31 +0800 Message-ID: <20171220045731.19343-18-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: 5A14448AEA0B.AB6D9 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 @trans in check_chunks_and_extents. After this patch, Lowmem repair should work again. Signed-off-by: Su Yue --- cmds-check.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cmds-check.c b/cmds-check.c index b51fcfd8ffdb..3f409c967f5e 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -13710,7 +13710,6 @@ static int repair_block_accounting(struct btrfs_fs_info *fs_info) */ static int check_chunks_and_extents_v2(struct btrfs_fs_info *fs_info) { - struct btrfs_trans_handle *trans = NULL; struct btrfs_path path; struct btrfs_key old_key; struct btrfs_key key; @@ -13722,14 +13721,6 @@ static int check_chunks_and_extents_v2(struct btrfs_fs_info *fs_info) root = fs_info->fs_root; - if (repair) { - trans = btrfs_start_transaction(fs_info->extent_root, 1); - if (IS_ERR(trans)) { - error("failed to start transaction before check"); - return PTR_ERR(trans); - } - } - root1 = root->fs_info->chunk_root; ret = check_btrfs_root(root1, 0, 1); err |= ret; @@ -13798,9 +13789,6 @@ out: err &= ~BG_ACCOUNTING_ERROR; } - if (trans) - btrfs_commit_transaction(trans, root->fs_info->extent_root); - btrfs_release_path(&path); return err; }