RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-28 17:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: send: use pr_stderr for messages

Browse Source 
Replace fprintf(stderr, ...) by the level-aware helper instead of the
explicit verbosity level checks. No change for commands that don't have
the global -q/-v options, otherwise the output can be quieted.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2022-10-05 14:27:57 +02:00
parent 449aab05be
commit f0df58635e
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmds/send.c
View File

@ -284,15 +284,12 @@ static int do_send(struct btrfs_send *send, u64 parent_root_id,
ret = -errno;
error("send ioctl failed with %d: %m", ret);
if (ret == -EINVAL && (!is_first_subvol || !is_last_subvol))
fprintf(stderr,
pr_stderr(LOG_DEFAULT,
"Try upgrading your kernel or don't use -e.\n");
goto out;
}
if (bconf.verbose > 1)
fprintf(stderr, "BTRFS_IOC_SEND returned %d\n", ret);
if (bconf.verbose > 1)
fprintf(stderr, "joining genl thread\n");
pr_stderr(LOG_INFO, "BTRFS_IOC_SEND returned %d\n", ret);
pr_stderr(LOG_DEBUG, "joining genl thread\n");
close(pipefd[1]);
pipefd[1] = -1;
@ -745,7 +742,7 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv)
if ((send_flags & BTRFS_SEND_FLAG_NO_FILE_DATA) && bconf.verbose > 1)
if (bconf.verbose > 1)
fprintf(stderr, "Mode NO_FILE_DATA enabled\n");
pr_stderr(LOG_DEFAULT, "Mode NO_FILE_DATA enabled\n");
send.proto_supported = get_sysfs_proto_supported();
if (send.proto_supported == 1) {
if (send.proto > send.proto_supported) {
@ -773,9 +770,8 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv)
goto out;
}
}
if (bconf.verbose > 1)
fprintf(stderr, "Protocol version requested: %u (supported %u)\n",
send.proto, send.proto_supported);
pr_stderr(LOG_INFO, "Protocol version requested: %u (supported %u)\n",
send.proto, send.proto_supported);
for (i = optind; i < argc; i++) {
int is_first_subvol;
@ -784,8 +780,7 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv)
free(subvol);
subvol = argv[i];
if (bconf.verbose > BTRFS_BCONF_QUIET)
fprintf(stderr, "At subvol %s\n", subvol);
pr_stderr(LOG_DEFAULT, "At subvol %s\n", subvol);
subvol = realpath(subvol, NULL);
if (!subvol) {