From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.com
Subject: [PATCH v1 05/18] btrfs-progs: send: use global verbose and quiet options
Date: Wed, 30 Oct 2019 16:41:09 +0800 [thread overview]
Message-ID: <20191030084122.29745-6-anand.jain@oracle.com> (raw)
In-Reply-To: <20191030084122.29745-1-anand.jain@oracle.com>
Transpire global --verbose and --quiet options down to the btrfs send
sub-command.
Suggested-by: David Sterba <dsterba@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
Global verbose-and-quiet option sequences behave differently from the
same sequence used in the local command, as show below.
Before:
btrfs.old send -q -v -f /tmp/f -p /btrfs/ss2 /btrfs/ss3
At subvol /btrfs/ss3
btrfs.old send -v -f /tmp/f -p /btrfs/ss2 /btrfs/ss3
At subvol /btrfs/ss3
BTRFS_IOC_SEND returned 0
joining genl thread
After:
btrfs.new send -q -v -f /tmp/f -p /btrfs/ss2 /btrfs/ss3
At subvol /btrfs/ss3
btrfs.new -q -v send -f /tmp/f -p /btrfs/ss2 /btrfs/ss3
At subvol /btrfs/ss3
BTRFS_IOC_SEND returned 0
joining genl thread
The (btrfs.new -q -v send) output is same as (btrfs.old send -v) which IMO
is acceptable and not a regression.
cmds/send.c | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/cmds/send.c b/cmds/send.c
index 7ce6c3273857..093f4e15c192 100644
--- a/cmds/send.c
+++ b/cmds/send.c
@@ -48,11 +48,6 @@
#define SEND_BUFFER_SIZE SZ_64K
-/*
- * Default is 1 for historical reasons, changing may break scripts that expect
- * the 'At subvol' message.
- */
-static int g_verbose = 1;
struct btrfs_send {
int send_fd;
@@ -292,10 +287,10 @@ static int do_send(struct btrfs_send *send, u64 parent_root_id,
"Try upgrading your kernel or don't use -e.\n");
goto out;
}
- if (g_verbose > 1)
+ if (bconf.verbose > 1)
fprintf(stderr, "BTRFS_IOC_SEND returned %d\n", ret);
- if (g_verbose > 1)
+ if (bconf.verbose > 1)
fprintf(stderr, "joining genl thread\n");
close(pipefd[1]);
@@ -460,6 +455,9 @@ static const char * const cmd_send_usage[] = {
"-v|--verbose enable verbose output to stderr, each occurrence of",
" this option increases verbosity",
"-q|--quiet suppress all messages, except errors",
+ HELPINFO_GLOBAL_OPTIONS_HEADER,
+ HELPINFO_INSERT_VERBOSE,
+ HELPINFO_INSERT_QUITE,
NULL
};
@@ -482,6 +480,17 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv)
send.dump_fd = fileno(stdout);
outname[0] = 0;
+ /*
+ * For send, verbose default is 1 (insteasd of 0) for historical reasons,
+ * changing may break scripts that expect the 'At subvol' message. But do
+ * it only when bconf.verbose is unset (-1) and also adjust the value,
+ * if global verbose is already set.
+ */
+ if (bconf.verbose < 0)
+ bconf.verbose = 1;
+ else if (bconf.verbose > 0)
+ bconf.verbose++;
+
optind = 0;
while (1) {
enum { GETOPT_VAL_SEND_NO_DATA = 256 };
@@ -497,10 +506,10 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv)
switch (c) {
case 'v':
- g_verbose++;
+ bconf.verbose++;
break;
case 'q':
- g_verbose = 0;
+ bconf.verbose = 0;
break;
case 'e':
new_end_cmd_semantic = 1;
@@ -680,8 +689,8 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv)
}
}
- if ((send_flags & BTRFS_SEND_FLAG_NO_FILE_DATA) && g_verbose > 1)
- if (g_verbose > 1)
+ if ((send_flags & BTRFS_SEND_FLAG_NO_FILE_DATA) && bconf.verbose > 1)
+ if (bconf.verbose > 1)
fprintf(stderr, "Mode NO_FILE_DATA enabled\n");
for (i = optind; i < argc; i++) {
@@ -691,7 +700,7 @@ static int cmd_send(const struct cmd_struct *cmd, int argc, char **argv)
free(subvol);
subvol = argv[i];
- if (g_verbose > 0)
+ if (bconf.verbose > 0)
fprintf(stderr, "At subvol %s\n", subvol);
subvol = realpath(subvol, NULL);
--
2.23.0
next prev parent reply other threads:[~2019-10-30 8:41 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 8:41 [PATCH v1 00/18] btrfs-progs: global verbose and quiet option Anand Jain
2019-10-30 8:41 ` [PATCH v1 01/18] btrfs-progs: receive: fix option quiet Anand Jain
2019-10-30 8:41 ` [PATCH v1 02/18] btrfs-progs: balance status: fix usage show long verbose Anand Jain
2019-10-30 8:41 ` [PATCH v1 03/18] btrfs-progs: balance start: fix usage add " Anand Jain
2019-10-30 8:41 ` [PATCH v1 04/18] btrfs-progs: add global verbose and quiet options and helper functions Anand Jain
2019-11-01 9:46 ` Antonio Pérez
2019-11-01 10:12 ` David Sterba
2019-11-02 1:15 ` Anand Jain
2019-10-30 8:41 ` Anand Jain [this message]
2019-10-30 8:41 ` [PATCH v1 06/18] btrfs-progs: receive: use global verbose and quiet options Anand Jain
2019-10-30 8:41 ` [PATCH v1 07/18] btrfs-progs: subvolume delete: use global verbose option Anand Jain
2019-10-30 8:41 ` [PATCH v1 08/18] btrfs-progs: filesystem defragment: " Anand Jain
2019-10-30 8:41 ` [PATCH v1 09/18] btrfs-progs: balance start: " Anand Jain
2019-10-30 8:41 ` [PATCH v1 10/18] btrfs-progs: balance status: " Anand Jain
2019-10-30 8:41 ` [PATCH v1 11/18] btrfs-progs: rescue chunk-recover: " Anand Jain
2019-10-30 8:41 ` [PATCH v1 12/18] btrfs-progs: rescue super-recover: " Anand Jain
2019-10-30 8:41 ` [PATCH v1 13/18] btrfs-progs: restore: " Anand Jain
2019-10-30 8:41 ` [PATCH v1 14/18] btrfs-progs: inspect-internal inode-resolve: use global verbose Anand Jain
2019-10-30 8:41 ` [PATCH v1 15/18] btrfs-progs: inspect-internal logical-resolve: use global verbose option Anand Jain
2019-10-30 8:41 ` [PATCH v1 16/18] btrfs-progs: refactor btrfs_scan_devices() to accept verbose argument Anand Jain
2019-10-30 8:41 ` [PATCH v1 17/18] btrfs-progs: device scan: add verbose option Anand Jain
2019-10-30 8:41 ` [PATCH v1 18/18] btrfs-progs: device scan: add quiet option Anand Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191030084122.29745-6-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).