RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-01 22:48:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: check: lowmem: remove parameter @trans of repair_chunk_item

Browse Source 
This patch removes parameter @trans of repair_chunk_item().
It calls try_avoid_extents_overwrite() and starts a transaction by
itself.

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>
This commit is contained in:
Su Yue 2018-05-08 16:30:05 +08:00 committed by David Sterba
parent e9f0396a42
commit b4069a192d
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
check/mode-lowmem.c
View File

@ -4087,13 +4087,14 @@ out:
* *
* Returns error after repair. * Returns error after repair.
*/ */
static int repair_chunk_item(struct btrfs_trans_handle *trans, static int repair_chunk_item(struct btrfs_root *chunk_root,
struct btrfs_root *chunk_root,
struct btrfs_path *path, int err) struct btrfs_path *path, int err)
{ {
struct btrfs_chunk *chunk; struct btrfs_chunk *chunk;
struct btrfs_key chunk_key; struct btrfs_key chunk_key;
struct extent_buffer *eb = path->nodes[0]; struct extent_buffer *eb = path->nodes[0];
struct btrfs_root *extent_root = chunk_root->fs_info->extent_root;
struct btrfs_trans_handle *trans;
u64 length; u64 length;
int slot = path->slots[0]; int slot = path->slots[0];
u64 type; u64 type;
@ -4106,21 +4107,36 @@ static int repair_chunk_item(struct btrfs_trans_handle *trans,
type = btrfs_chunk_type(path->nodes[0], chunk); type = btrfs_chunk_type(path->nodes[0], chunk);
length = btrfs_chunk_length(eb, chunk); length = btrfs_chunk_length(eb, chunk);
if (err & REFERENCER_MISSING) { /* now repair only adds block group */
ret = btrfs_make_block_group(trans, chunk_root->fs_info, 0, if ((err & REFERENCER_MISSING) == 0)
type, chunk_key.offset, length); return err;
if (ret) {
error("fail to add block group item[%llu %llu]", ret = avoid_extents_overwrite(chunk_root->fs_info);
chunk_key.offset, length); if (ret)
goto out; return ret;
} else {
err &= ~REFERENCER_MISSING; trans = btrfs_start_transaction(extent_root, 1);
printf("Added block group item[%llu %llu]\n", if (IS_ERR(trans)) {
chunk_key.offset, length); ret = PTR_ERR(trans);
} error("fail to start transaction %s", strerror(-ret));
return ret;
} }
out: ret = btrfs_make_block_group(trans, chunk_root->fs_info, 0, type,
chunk_key.offset, length);
if (ret) {
error("fail to add block group item [%llu %llu]",
chunk_key.offset, length);
} else {
err &= ~REFERENCER_MISSING;
printf("Added block group item[%llu %llu]\n", chunk_key.offset,
length);
}
btrfs_commit_transaction(trans, extent_root);
if (ret)
error("fail to repair item(s) related to chunk item [%llu %llu]",
chunk_key.objectid, chunk_key.offset);
return err; return err;
} }
@ -4219,7 +4235,7 @@ again:
case BTRFS_CHUNK_ITEM_KEY: case BTRFS_CHUNK_ITEM_KEY:
ret = check_chunk_item(fs_info, eb, slot); ret = check_chunk_item(fs_info, eb, slot);
if (repair && ret) if (repair && ret)
ret = repair_chunk_item(trans, root, path, ret); ret = repair_chunk_item(root, path, ret);
err |= ret; err |= ret;
break; break;
case BTRFS_DEV_EXTENT_KEY: case BTRFS_DEV_EXTENT_KEY: