From patchwork Thu Jan 11 07:35:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10157437 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 580AD601A1 for ; Thu, 11 Jan 2018 07:31:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4768B286F1 for ; Thu, 11 Jan 2018 07:31:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C78F286F5; Thu, 11 Jan 2018 07:31:33 +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 E4FAE286F1 for ; Thu, 11 Jan 2018 07:31:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932215AbeAKHbb (ORCPT ); Thu, 11 Jan 2018 02:31:31 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:22396 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932107AbeAKHba (ORCPT ); Thu, 11 Jan 2018 02:31:30 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35167995" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 11 Jan 2018 15:31:28 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id DA30648AEA11 for ; Thu, 11 Jan 2018 15:31:26 +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:24 +0800 From: Su Yue To: CC: Subject: [PATCH v3 17/17] btrfs-progs: lowmem check: end of removing parameters @trans in lowmem Date: Thu, 11 Jan 2018 15:35:11 +0800 Message-ID: <20180111073511.25288-18-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: DA30648AEA11.ABA4A 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 4d6245fa909b..4884d78681ab 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -13804,7 +13804,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; @@ -13816,14 +13815,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; @@ -13892,9 +13883,6 @@ out: err &= ~BG_ACCOUNTING_ERROR; } - if (trans) - btrfs_commit_transaction(trans, root->fs_info->extent_root); - btrfs_release_path(&path); return err; }