diff options
| author | Su Yue <suy.fnst@cn.fujitsu.com> | 2018-05-08 16:30:10 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-06-07 16:37:31 +0200 |
| commit | ea8763bd05c26a14b7236cd5a4e9fef88d8f0ce4 (patch) | |
| tree | 08f466c5a6cec8ab2d7c494fad8b95b2529208f0 | |
| parent | b9fb29a9ba757516821fb7cbebcbf02833b8c829 (diff) | |
btrfs-progs: check: lowmem: introduce repair_block_accounting
Introduce repair_block_accounting() which calls
btrfs_fix_block_accounting() to repair block group accouting.
Replace btrfs_fix_block_accounting() with the new function.
Note: This patch and next patches cause error in lowmem repair like:
"Error: Commit_root already set when starting transaction".
Such error will disappear after removing @trans finished.
Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | check/mode-lowmem.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index e8588c38..ea6163a6 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -538,6 +538,30 @@ static int end_avoid_extents_overwrite(struct btrfs_fs_info *fs_info) } /* + * 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; +} + +/* * This function only handles BACKREF_MISSING, * If corresponding extent item exists, increase the ref, else insert an extent * item and backref. @@ -4991,7 +5015,7 @@ out: reset_cached_block_groups(fs_info); /* update block accounting */ - ret = btrfs_fix_block_accounting(trans, root); + ret = repair_block_accounting(fs_info); if (ret) err |= ret; else |