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 <suy.f...@cn.fujitsu.com>
---
 cmds-check.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/cmds-check.c b/cmds-check.c
index 1c93b1178b23..4d6245fa909b 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -13775,6 +13775,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.
  */
@@ -13861,7 +13885,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



--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to