RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: check: add more progress or error messages 

Some steps don't seem to have a message printed when they start, like
the tree-log clearing or checksum fill phase.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2024-04-05 03:25:58 +02:00
parent 331e61646e
commit 80b0a3ce2d
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
check/main.c
View File

@ -10380,6 +10380,7 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
err |= !!ret;
goto close_out;
}
pr_verbose(LOG_DEFAULT, "Clearing tree-log\n");
ret = zero_log_tree(root);
err |= !!ret;
if (ret) {
@ -10389,8 +10390,7 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
}
if (qgroup_report) {
printf("Print quota groups for %s\nUUID: %s\n", argv[optind],
uuidbuf);
printf("Print quota groups report for %s\nUUID: %s\n", argv[optind], uuidbuf);
ret = qgroup_verify_all(gfs_info);
err |= !!ret;
if (ret >= 0)
@ -10447,6 +10447,7 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
goto close_out;
}
pr_verbose(LOG_DEFAULT, "Fill checksum tree\n");
ret = fill_csum_tree(trans, init_extent_tree);
err |= !!ret;
if (ret) {
@ -10460,8 +10461,11 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
*/
ret = btrfs_commit_transaction(trans, gfs_info->tree_root);
err |= !!ret;
if (ret)
if (ret) {
errno = -ret;
error_msg(ERROR_MSG_COMMIT_TRANS, "%m");
goto close_out;
}
}
ret = check_global_roots_uptodate();
@ -10520,8 +10524,7 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
task_stop(g_task_ctx.info);
err |= !!ret;
if (ret)
error(
"errors found in extent allocation tree or chunk allocation");
error("errors found in extent allocation tree or chunk allocation");
/* Only re-check super size after we checked and repaired the fs */
err |= !is_super_size_valid();

8
check/mode-common.c
View File

@ -1070,8 +1070,12 @@ int recow_extent_buffer(struct btrfs_root *root, struct extent_buffer *eb)
}
trans = btrfs_start_transaction(root, 1);
if (IS_ERR(trans))
return PTR_ERR(trans);
if (IS_ERR(trans)) {
ret = PTR_ERR(trans);
errno = -ret;
error_msg(ERROR_MSG_START_TRANS, "%m");
return ret;
}
path.lowest_level = btrfs_header_level(eb);
if (path.lowest_level)