RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-25 22:40:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: use error helper for messages in non-kernel code

Browse Source 
Lots of code still uses fprintf(stderr, "...") that should be the
error() helper. The kernel-shared code is left out of the conversion for
now.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2022-09-16 19:29:25 +02:00
parent b5aac254c7
commit 0e38e1c4f2
8 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
check/qgroup-verify.c
View File

@ -1521,8 +1521,7 @@ int print_extent_state(struct btrfs_fs_info *info, u64 subvol)
tree_blocks = ulist_alloc(0);
if (!tree_blocks) {
fprintf(stderr,
"ERROR: Out of memory while allocating ulist.\n");
error("out of memory while allocating ulist");
return ENOMEM;
}
@ -1536,15 +1535,14 @@ int print_extent_state(struct btrfs_fs_info *info, u64 subvol)
ret = scan_extents(info, bg->start,
bg->start + bg->length - 1);
if (ret) {
fprintf(stderr, "ERROR: while scanning extent tree: %d\n",
ret);
error("while scanning extent tree: %d", ret);
goto out;
}
}
ret = map_implied_refs(info);
if (ret) {
fprintf(stderr, "ERROR: while mapping refs: %d\n", ret);
error("while mapping refs: %d", ret);
goto out;
}

14
cmds/replace.c
View File

@ -202,9 +202,7 @@ static int cmd_replace_start(const struct cmd_struct *cmd,
status_args.result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT;
ret = ioctl(fdmnt, BTRFS_IOC_DEV_REPLACE, &status_args);
if (ret < 0) {
fprintf(stderr,
"ERROR: ioctl(DEV_REPLACE_STATUS) failed on \"%s\": %m",
path);
error("ioctl(DEV_REPLACE_STATUS) failed on \"%s\": %m", path);
if (status_args.result != BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT)
fprintf(stderr, ", %s\n",
replace_dev_result2string(status_args.result));
@ -325,9 +323,7 @@ static int cmd_replace_start(const struct cmd_struct *cmd,
ret = ioctl(fdmnt, BTRFS_IOC_DEV_REPLACE, &start_args);
if (do_not_background) {
if (ret < 0) {
fprintf(stderr,
"ERROR: ioctl(DEV_REPLACE_START) failed on \"%s\": %m",
path);
error("ioctl(DEV_REPLACE_START) failed on \"%s\": %m", path);
if (start_args.result != BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT)
fprintf(stderr, ", %s\n",
replace_dev_result2string(start_args.result));
@ -429,8 +425,7 @@ static int print_replace_status(int fd, const char *path, int once)
args.result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT;
ret = ioctl(fd, BTRFS_IOC_DEV_REPLACE, &args);
if (ret < 0) {
fprintf(stderr, "ERROR: ioctl(DEV_REPLACE_STATUS) failed on \"%s\": %m",
path);
error("ioctl(DEV_REPLACE_STATUS) failed on \"%s\": %m", path);
if (args.result != BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT)
fprintf(stderr, ", %s\n",
replace_dev_result2string(args.result));
@ -579,8 +574,7 @@ static int cmd_replace_cancel(const struct cmd_struct *cmd,
ret = ioctl(fd, BTRFS_IOC_DEV_REPLACE, &args);
close_file_or_dir(fd, dirstream);
if (ret < 0) {
fprintf(stderr, "ERROR: ioctl(DEV_REPLACE_CANCEL) failed on \"%s\": %m",
path);
error("ioctl(DEV_REPLACE_CANCEL) failed on \"%s\": %m", path);
if (args.result != BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT)
fprintf(stderr, ", %s\n",
replace_dev_result2string(args.result));

2
cmds/subvolume.c
View File

@ -1485,7 +1485,7 @@ static int cmd_subvol_show(const struct cmd_struct *cmd, int argc, char **argv)
}
if (ret) {
fprintf(stderr, "ERROR: quota query failed: %m");
error("quota query failed: %m");
goto out;
}

9
common/send-utils.c
View File

@ -42,7 +42,7 @@ static int btrfs_get_root_id_by_sub_path(int mnt_fd, const char *sub_path,
subvol_fd = openat(mnt_fd, sub_path, O_RDONLY);
if (subvol_fd < 0) {
ret = -errno;
fprintf(stderr, "ERROR: open %s failed: %m\n", sub_path);
error("open %s failed: %m", sub_path);
return ret;
}
@ -87,8 +87,7 @@ static int btrfs_read_root_item_raw(int mnt_fd, u64 root_id, size_t buf_len,
while (1) {
ret = ioctl(mnt_fd, BTRFS_IOC_TREE_SEARCH, &args);
if (ret < 0) {
fprintf(stderr,
"ERROR: can't perform the search - %m\n");
error("can't perform the search: %m");
return 0;
}
/* the ioctl returns the number of item it found in nr_items */
@ -116,8 +115,8 @@ static int btrfs_read_root_item_raw(int mnt_fd, u64 root_id, size_t buf_len,
btrfs_search_header_type(sh) == BTRFS_ROOT_ITEM_KEY) {
if (btrfs_search_header_len(sh) > buf_len) {
/* btrfs-progs is too old for kernel */
fprintf(stderr,
"ERROR: buf for read_root_item_raw() is too small, get newer btrfs tools!\n");
error(
"buf for read_root_item_raw() is too small, get newer btrfs tools");
return -EOVERFLOW;
}
memcpy(buf, item, btrfs_search_header_len(sh));

11
common/string-utils.c
View File

@ -18,7 +18,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <limits.h>
#include "string-utils.h"
#include "common/string-utils.h"
#include "common/messages.h"
int string_is_numerical(const char *str)
{
@ -53,8 +54,7 @@ u64 arg_strtou64(const char *str)
value = strtoull(str, &ptr_parse_end, 0);
if (ptr_parse_end && *ptr_parse_end != '\0') {
fprintf(stderr, "ERROR: %s is not a valid numeric value.\n",
str);
error("%s is not a valid numeric value", str);
exit(1);
}
@ -63,12 +63,11 @@ u64 arg_strtou64(const char *str)
* unexpected number to us, so let's do the check ourselves.
*/
if (str[0] == '-') {
fprintf(stderr, "ERROR: %s: negative value is invalid.\n",
str);
error("%s: negative value is invalid", str);
exit(1);
}
if (value == ULLONG_MAX) {
fprintf(stderr, "ERROR: %s is too large.\n", str);
error("%s is too large", str);
exit(1);
}
return value;

10
common/utils.c
View File

@ -367,17 +367,15 @@ int test_num_disk_vs_raid(u64 metadata_profile, u64 data_profile,
warning("DUP is not recommended on filesystem with multiple devices");
}
if (metadata_profile & ~allowed) {
fprintf(stderr,
"ERROR: unable to create FS with metadata profile %s "
"(have %llu devices but %d devices are required)\n",
error("unable to create FS with metadata profile %s "
"(have %llu devices but %d devices are required)",
btrfs_group_profile_str(metadata_profile), dev_cnt,
btrfs_bg_type_to_devs_min(metadata_profile));
return 1;
}
if (data_profile & ~allowed) {
fprintf(stderr,
"ERROR: unable to create FS with data profile %s "
"(have %llu devices but %d devices are required)\n",
error("ERROR: unable to create FS with data profile %s "
"(have %llu devices but %d devices are required)",
btrfs_group_profile_str(data_profile), dev_cnt,
btrfs_bg_type_to_devs_min(data_profile));
return 1;

10
crypto/hash-speedtest.c
View File

@ -28,6 +28,7 @@
#include "crypto/crc32c.h"
#include "crypto/sha.h"
#include "crypto/blake2.h"
#include "common/messages.h"
#ifdef __x86_64__
static const int cycles_supported = 1;
@ -206,8 +207,7 @@ int main(int argc, char **argv) {
switch (c) {
case 'c':
if (!cycles_supported) {
fprintf(stderr,
"ERROR: cannot measure cycles on this arch, use --time\n");
error("cannot measure cycles on this arch, use --time");
return 1;
}
units = UNITS_CYCLES;
@ -217,14 +217,14 @@ int main(int argc, char **argv) {
break;
case 'p':
if (perf_init() == -1) {
fprintf(stderr,
"ERROR: cannot initialize perf, please check sysctl kernel.perf_event_paranoid: %m\n");
error(
"cannot initialize perf, please check sysctl kernel.perf_event_paranoid: %m");
return 1;
}
units = UNITS_PERF;
break;
default:
fprintf(stderr, "ERROR: unknown option\n");
error("unknown option");
return 1;
}
}

3
crypto/hash-vectest.c
View File

@ -19,6 +19,7 @@
#include "crypto/crc32c.h"
#include "crypto/sha.h"
#include "crypto/blake2.h"
#include "common/messages.h"
struct hash_testvec {
const char *plaintext;
@ -157,7 +158,7 @@ int test_hash(const struct hash_testspec *spec)
ret = spec->hash((const u8 *)vec->plaintext, vec->psize, csum);
if (ret < 0) {
printf("ERROR: hash %s = %d\n", spec->name, ret);
error("hash %s = %d", spec->name, ret);
return 1;
}
if (memcmp(csum, vec->digest, spec->digest_size) == 0) {