From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.cn.fujitsu.com ([183.91.158.132]:38594 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754493AbdLTExv (ORCPT ); Tue, 19 Dec 2017 23:53:51 -0500 From: Su Yue To: CC: , Subject: [PATCH v2 16/17] btrfs-progs: lowmem check: introduce repair_block_accounting() Date: Wed, 20 Dec 2017 12:57:30 +0800 Message-ID: <20171220045731.19343-17-suy.fnst@cn.fujitsu.com> In-Reply-To: <20171220045731.19343-1-suy.fnst@cn.fujitsu.com> References: <20171220045731.19343-1-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-btrfs-owner@vger.kernel.org List-ID: Introduce repair_block_accounting() which calls btrfs_fix_block_accounting() to repair block group accouting. Replace btrfs_fix_block_accounting() with the new function. Signed-off-by: Su Yue --- cmds-check.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/cmds-check.c b/cmds-check.c index 81e125b9315f..b51fcfd8ffdb 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -13681,6 +13681,30 @@ static int try_avoid_extents_overwrite(struct btrfs_fs_info *fs_info) return ret; } +/* + * Wrapper function for btrfs_fix_block_accounting(). + * + * Returns 0 on success. + * Returns != 0 on error. + */ +static int repair_block_accounting(struct btrfs_fs_info *fs_info) +{ + struct btrfs_trans_handle *trans = NULL; + struct btrfs_root *root = fs_info->extent_root; + int ret; + + trans = btrfs_start_transaction(root, 1); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + error("fail to start transaction %s", strerror(-ret)); + return ret; + } + + ret = btrfs_fix_block_accounting(trans, root); + btrfs_commit_transaction(trans, root); + return ret; +} + /* * Low memory usage version check_chunks_and_extents. */ @@ -13767,7 +13791,7 @@ out: modify_block_groups_cache(fs_info, BTRFS_BLOCK_GROUP_METADATA, 0); - ret = btrfs_fix_block_accounting(trans, root); + ret = repair_block_accounting(fs_info); if (ret) err |= ret; else -- 2.15.1