From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.com
Subject: [PATCH v1 06/18] btrfs-progs: receive: use global verbose and quiet options
Date: Wed, 30 Oct 2019 16:41:10 +0800 [thread overview]
Message-ID: <20191030084122.29745-7-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 receive
sub-command.
Suggested-by: David Sterba <dsterba@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
Global verbose and quite option sequences behave differently from the
same sequence in the local command, as show below.
Before:
btrfs receive -q -v -f /tmp/t /btrfs1
At snapshot ss3
btrfs receive -v -f /tmp/t /btrfs1
At snapshot ss3
receiving snapshot ss3 uuid=9d0001ec-29e4-194a-a13e-42d9f428d745, ctransid=11 parent_uuid=a6b75134-8865-f045-89d2-c2afcf794475, parent_ctransid=11
BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=9d0001ec-29e4-194a-a13e-42d9f428d745, stransid=11
After:
In the sub-command level the output remains same as before.
btrfs receive -q -v -f /tmp/t /btrfs1
At snapshot ss3
In the global verbose level it does it correctly
which is same as 'before: btrfs receive -v'
btrfs -q -v receive -f /tmp/t /btrfs1
At snapshot ss3
receiving snapshot ss3 uuid=9d0001ec-29e4-194a-a13e-42d9f428d745, ctransid=11 parent_uuid=a6b75134-8865-f045-89d2-c2afcf794475, parent_ctransid=11
BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=9d0001ec-29e4-194a-a13e-42d9f428d745, stransid=11
btrfs -q -v receive is same as btrfs -v receive, I belive this isn't regression.
cmds/receive.c | 80 +++++++++++++++++++++++++++-----------------------
1 file changed, 44 insertions(+), 36 deletions(-)
diff --git a/cmds/receive.c b/cmds/receive.c
index c4827c1dd999..d9f1928a28b9 100644
--- a/cmds/receive.c
+++ b/cmds/receive.c
@@ -53,12 +53,6 @@
#include "common/help.h"
#include "common/path-utils.h"
-/*
- * Default is 1 for historical reasons, changing may break scripts that expect
- * the 'At subvol' message.
- */
-static int g_verbose = 1;
-
struct btrfs_receive
{
int mnt_fd;
@@ -116,7 +110,7 @@ static int finish_subvol(struct btrfs_receive *rctx)
memcpy(rs_args.uuid, rctx->cur_subvol.received_uuid, BTRFS_UUID_SIZE);
rs_args.stransid = rctx->cur_subvol.stransid;
- if (g_verbose >= 2) {
+ if (bconf.verbose >= 2) {
uuid_unparse((u8*)rs_args.uuid, uuid_str);
fprintf(stderr, "BTRFS_IOC_SET_RECEIVED_SUBVOL uuid=%s, "
"stransid=%llu\n", uuid_str, rs_args.stransid);
@@ -199,13 +193,13 @@ static int process_subvol(const char *path, const u8 *uuid, u64 ctransid,
goto out;
}
- if (g_verbose)
+ if (bconf.verbose >= 1)
fprintf(stderr, "At subvol %s\n", path);
memcpy(rctx->cur_subvol.received_uuid, uuid, BTRFS_UUID_SIZE);
rctx->cur_subvol.stransid = ctransid;
- if (g_verbose >= 2) {
+ if (bconf.verbose >= 2) {
uuid_unparse((u8*)rctx->cur_subvol.received_uuid, uuid_str);
fprintf(stderr, "receiving subvol %s uuid=%s, stransid=%llu\n",
path, uuid_str,
@@ -269,13 +263,12 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid,
goto out;
}
- if (g_verbose)
- fprintf(stdout, "At snapshot %s\n", path);
+ pr_verbose(1, "At snapshot %s\n", path);
memcpy(rctx->cur_subvol.received_uuid, uuid, BTRFS_UUID_SIZE);
rctx->cur_subvol.stransid = ctransid;
- if (g_verbose >= 2) {
+ if (bconf.verbose >= 2) {
uuid_unparse((u8*)rctx->cur_subvol.received_uuid, uuid_str);
fprintf(stderr, "receiving snapshot %s uuid=%s, "
"ctransid=%llu ", path, uuid_str,
@@ -402,7 +395,7 @@ static int process_mkfile(const char *path, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "mkfile %s\n", path);
ret = creat(full_path, 0600);
@@ -430,7 +423,7 @@ static int process_mkdir(const char *path, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "mkdir %s\n", path);
ret = mkdir(full_path, 0700);
@@ -455,7 +448,7 @@ static int process_mknod(const char *path, u64 mode, u64 dev, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "mknod %s mode=%llu, dev=%llu\n",
path, mode, dev);
@@ -481,7 +474,7 @@ static int process_mkfifo(const char *path, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "mkfifo %s\n", path);
ret = mkfifo(full_path, 0600);
@@ -506,7 +499,7 @@ static int process_mksock(const char *path, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "mksock %s\n", path);
ret = mknod(full_path, 0600 | S_IFSOCK, 0);
@@ -531,7 +524,7 @@ static int process_symlink(const char *path, const char *lnk, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "symlink %s -> %s\n", path, lnk);
ret = symlink(lnk, full_path);
@@ -563,7 +556,7 @@ static int process_rename(const char *from, const char *to, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "rename %s -> %s\n", from, to);
ret = rename(full_from, full_to);
@@ -595,7 +588,7 @@ static int process_link(const char *path, const char *lnk, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "link %s -> %s\n", path, lnk);
ret = link(full_link_path, full_path);
@@ -621,7 +614,7 @@ static int process_unlink(const char *path, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "unlink %s\n", path);
ret = unlink(full_path);
@@ -646,7 +639,7 @@ static int process_rmdir(const char *path, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "rmdir %s\n", path);
ret = rmdir(full_path);
@@ -711,7 +704,7 @@ static int process_write(const char *path, const void *data, u64 offset,
if (ret < 0)
goto out;
- if (g_verbose >= 2)
+ if (bconf.verbose >= 2)
fprintf(stderr, "write %s - offset=%llu length=%llu\n",
path, offset, len);
@@ -819,7 +812,7 @@ static int process_clone(const char *path, u64 offset, u64 len,
goto out;
}
- if (g_verbose >= 2)
+ if (bconf.verbose >= 2)
fprintf(stderr,
"clone %s - source=%s source offset=%llu offset=%llu length=%llu\n",
path, clone_path, clone_offset, offset, len);
@@ -860,7 +853,7 @@ static int process_set_xattr(const char *path, const char *name,
}
if (strcmp("security.capability", name) == 0) {
- if (g_verbose >= 4)
+ if (bconf.verbose >= 4)
fprintf(stderr, "set_xattr: cache capabilities\n");
if (rctx->cached_capabilities_len)
warning("capabilities set multiple times per file: %s",
@@ -875,7 +868,7 @@ static int process_set_xattr(const char *path, const char *name,
memcpy(rctx->cached_capabilities, data, len);
}
- if (g_verbose >= 3) {
+ if (bconf.verbose >= 3) {
fprintf(stderr, "set_xattr %s - name=%s data_len=%d "
"data=%.*s\n", path, name, len,
len, (char*)data);
@@ -905,7 +898,7 @@ static int process_remove_xattr(const char *path, const char *name, void *user)
goto out;
}
- if (g_verbose >= 3) {
+ if (bconf.verbose >= 3) {
fprintf(stderr, "remove_xattr %s - name=%s\n",
path, name);
}
@@ -933,7 +926,7 @@ static int process_truncate(const char *path, u64 size, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "truncate %s size=%llu\n", path, size);
ret = truncate(full_path, size);
@@ -959,7 +952,7 @@ static int process_chmod(const char *path, u64 mode, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "chmod %s - mode=0%o\n", path, (int)mode);
ret = chmod(full_path, mode);
@@ -985,7 +978,7 @@ static int process_chown(const char *path, u64 uid, u64 gid, void *user)
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "chown %s - uid=%llu, gid=%llu\n", path,
uid, gid);
@@ -997,7 +990,7 @@ static int process_chown(const char *path, u64 uid, u64 gid, void *user)
}
if (rctx->cached_capabilities_len) {
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "chown: restore capabilities\n");
ret = lsetxattr(full_path, "security.capability",
rctx->cached_capabilities,
@@ -1031,7 +1024,7 @@ static int process_utimes(const char *path, struct timespec *at,
goto out;
}
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "utimes %s\n", path);
tv[0] = *at;
@@ -1050,7 +1043,7 @@ out:
static int process_update_extent(const char *path, u64 offset, u64 len,
void *user)
{
- if (g_verbose >= 3)
+ if (bconf.verbose >= 3)
fprintf(stderr, "update_extent %s: offset=%llu, len=%llu\n",
path, (unsigned long long)offset,
(unsigned long long)len);
@@ -1190,7 +1183,7 @@ static int do_receive(struct btrfs_receive *rctx, const char *tomnt,
while (!end) {
if (rctx->cached_capabilities_len) {
- if (g_verbose >= 4)
+ if (bconf.verbose >= 4)
fprintf(stderr, "clear cached capabilities\n");
memset(rctx->cached_capabilities, 0,
sizeof(rctx->cached_capabilities));
@@ -1279,6 +1272,9 @@ static const char * const cmd_receive_usage[] = {
" this file system is mounted.",
"--dump dump stream metadata, one line per operation,",
" does not require the MOUNT parameter",
+ HELPINFO_GLOBAL_OPTIONS_HEADER,
+ HELPINFO_INSERT_VERBOSE,
+ HELPINFO_INSERT_QUITE,
NULL
};
@@ -1301,6 +1297,18 @@ static int cmd_receive(const struct cmd_struct *cmd, int argc, char **argv)
realmnt[0] = 0;
fromfile[0] = 0;
+ /*
+ * Init global verbose to default, if it is unset.
+ * Default is 1 for historical reasons, changing may break scripts that
+ * expect the 'At subvol' message.
+ * As default is 1, which means the effective verbose for receive is 2
+ * which global verbose is unaware. So adjust global verbose value here.
+ */
+ if (bconf.verbose < 0)
+ bconf.verbose = 1;
+ else if (bconf.verbose > 0)
+ bconf.verbose++;
+
optind = 0;
while (1) {
int c;
@@ -1319,10 +1327,10 @@ static int cmd_receive(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 'f':
if (arg_copy_path(fromfile, optarg, sizeof(fromfile))) {
--
2.23.0
next prev parent reply other threads:[~2019-10-30 8:43 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 ` [PATCH v1 05/18] btrfs-progs: send: use global verbose and quiet options Anand Jain
2019-10-30 8:41 ` Anand Jain [this message]
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-7-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.