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: adjust multiple block group warning format

Browse Source 
Use simpler output format for easier parsing and place each block group
type on a separate line.

Example output:

WARNING: Multiple block group profiles detected, see 'man btrfs(5)'.
WARNING:   Data: single, raid1

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2020-05-04 16:13:05 +02:00
parent 047dc287ec
commit 3e6c9bed5c
2 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
common/utils.c
View File

@ -1825,7 +1825,6 @@ int btrfs_test_for_multiple_profiles_by_fd(int fd)
int btrfs_warn_multiple_profiles(int fd)
{
int ret;
int first = true;
char *data_prof, *mixed_prof, *metadata_prof, *system_prof;
ret = btrfs_get_string_for_multiple_profiles(fd, &data_prof,
@ -1835,41 +1834,23 @@ int btrfs_warn_multiple_profiles(int fd)
return ret;
fprintf(stderr,
"WARNING: Multiple profiles detected. See 'man btrfs(5)'.\n");
fprintf(stderr, "WARNING: ");
if (data_prof) {
fprintf(stderr, "data -> [%s]", data_prof);
first = false;
}
if (metadata_prof) {
if (!first)
fprintf(stderr, ", ");
fprintf(stderr, "metadata -> [%s]", metadata_prof);
first = false;
}
if (mixed_prof) {
if (!first)
fprintf(stderr, ", ");
fprintf(stderr, "data+metadata -> [%s]", mixed_prof);
first = false;
}
if (system_prof) {
if (!first)
fprintf(stderr, ", ");
fprintf(stderr, "system -> [%s]", system_prof);
first = false;
}
fprintf(stderr, "\n");
"WARNING: Multiple block group profiles detected, see 'man btrfs(5)'.\n");
if (data_prof)
free(data_prof);
fprintf(stderr, "WARNING: Data: %s\n", data_prof);
if (metadata_prof)
free(metadata_prof);
fprintf(stderr, "WARNING: Metadata: %s\n", metadata_prof);
if (mixed_prof)
free(mixed_prof);
fprintf(stderr, "WARNING: Data+Metadata: %s\n", mixed_prof);
if (system_prof)
free(system_prof);
fprintf(stderr, "WARNING: System: %s\n", system_prof);
free(data_prof);
free(metadata_prof);
free(mixed_prof);
free(system_prof);
return 1;
}

2
tests/cli-tests/014-multiple-profiles-warning/test.sh
View File

@ -57,7 +57,7 @@ setup_loopdevs 4
prepare_loopdevs
dev1=${loopdevs[1]}
TEST_DEV=$dev1
msg="Multiple profiles detected"
msg="Multiple block group profiles detected"
# Data and metadata
run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f -d single -m single "${loopdevs[@]}"