@@ -202,7 +202,7 @@ static void print_one_uuid(struct btrfs_fs_devices *fs_devices)
super_bytes_used = pretty_sizes(device->super_bytes_used);
total = device->total_devs;
- printf(" uuid: %s\n\tTotal devices %llu FS bytes used %s\n", uuidbuf,
+ printf(" uuid: %s\n\tTotal devices %llu FS space used %s\n", uuidbuf,
(unsigned long long)total, super_bytes_used);
free(super_bytes_used);
@@ -125,7 +125,7 @@ static void print_scrub_summary(struct btrfs_scrub_progress *p)
{
u64 err_cnt;
u64 err_cnt2;
- char *bytes;
+ char *total;
err_cnt = p->read_errors +
p->csum_errors +
@@ -137,10 +137,10 @@ static void print_scrub_summary(struct btrfs_scrub_progress *p)
if (p->malloc_errors)
printf("*** WARNING: memory allocation failed while scrubbing. "
"results may be inaccurate\n");
- bytes = pretty_sizes(p->data_bytes_scrubbed + p->tree_bytes_scrubbed);
- printf("\ttotal bytes scrubbed: %s with %llu errors\n", bytes,
+ total = pretty_sizes(p->data_bytes_scrubbed + p->tree_bytes_scrubbed);
+ printf("\ttotal scrubbed: %s with %llu errors\n", total,
max(err_cnt, err_cnt2));
- free(bytes);
+ free(total);
if (err_cnt || err_cnt2) {
printf("\terror details:");
PRINT_SCRUB_ERROR(p->read_errors, "read");
From: Goffredo Baroncelli <kreijack@inwind.it> When the function pretty_sizes() is used, the word "bytes" must avoided. --- cmds-filesystem.c | 2 +- cmds-scrub.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)