From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v1.1 13/18] btrfs-progs: restore: use global verbose option
Date: Mon, 4 Nov 2019 14:33:11 +0800 [thread overview]
Message-ID: <1572849196-21775-14-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1572849196-21775-1-git-send-email-anand.jain@oracle.com>
Transpire global --verbose option down to the btrfs restore sub-command.
Suggested-by: David Sterba <dsterba@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v1.1: use pr_verbose(-1,..) instead of all conditions printf();
cmds/restore.c | 57 +++++++++++++++++++++++++++------------------------------
1 file changed, 27 insertions(+), 30 deletions(-)
diff --git a/cmds/restore.c b/cmds/restore.c
index c104b01aef69..5afa1c7c40ff 100644
--- a/cmds/restore.c
+++ b/cmds/restore.c
@@ -51,7 +51,6 @@ static char fs_name[PATH_MAX];
static char path_name[PATH_MAX];
static char symlink_target[PATH_MAX];
static int get_snaps = 0;
-static int verbose = 0;
static int restore_metadata = 0;
static int restore_symlinks = 0;
static int ignore_errors = 0;
@@ -375,8 +374,7 @@ static int copy_one_extent(struct btrfs_root *root, int fd,
if (compress == BTRFS_COMPRESS_NONE)
bytenr += offset;
- if (verbose && offset)
- printf("offset is %Lu\n", offset);
+ pr_verbose(offset ? 1 : 0, "offset is %Lu\n", offset);
/* we found a hole */
if (disk_size == 0)
return 0;
@@ -832,11 +830,13 @@ static int overwrite_ok(const char * path)
if (overwrite)
return 2;
- if (verbose || !warn)
- printf("Skipping existing file"
- " %s\n", path);
- if (!warn)
- printf("If you wish to overwrite use -o\n");
+ if (!warn) {
+ pr_verbose(-1, "Skipping existing file %s\n", path);
+ pr_verbose(-1, "If you wish to overwrite use -o\n");
+ } else {
+ pr_verbose(1, "Skipping existing file %s\n", path);
+ }
+
warn = 1;
return 0;
}
@@ -987,9 +987,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
leaf = path.nodes[0];
while (!leaf) {
- if (verbose > 1)
- printf("No leaf after search, looking for the next "
- "leaf\n");
+ pr_verbose(2,
+ "No leaf after search, looking for the next leaf\n");
ret = next_leaf(root, &path);
if (ret < 0) {
fprintf(stderr, "Error getting next leaf %d\n",
@@ -997,9 +996,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
goto out;
} else if (ret > 0) {
/* No more leaves to search */
- if (verbose)
- printf("Reached the end of the tree looking "
- "for the directory\n");
+ pr_verbose(1,
+ "Reached the end of the tree looking for the directory\n");
ret = 0;
goto out;
}
@@ -1023,10 +1021,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
goto out;
} else if (ret > 0) {
/* No more leaves to search */
- if (verbose)
- printf("Reached the end of "
- "the tree searching the"
- " directory\n");
+ pr_verbose(1,
+ "Reached the end of the tree searching the directory\n");
ret = 0;
goto out;
}
@@ -1036,14 +1032,12 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
}
btrfs_item_key_to_cpu(leaf, &found_key, path.slots[0]);
if (found_key.objectid != key->objectid) {
- if (verbose > 1)
- printf("Found objectid=%Lu, key=%Lu\n",
- found_key.objectid, key->objectid);
+ pr_verbose(2, "Found objectid=%Lu, key=%Lu\n",
+ found_key.objectid, key->objectid);
break;
}
if (found_key.type != key->type) {
- if (verbose > 1)
- printf("Found type=%u, want=%u\n",
+ pr_verbose(2, "Found type=%u, want=%u\n",
found_key.type, key->type);
break;
}
@@ -1072,8 +1066,7 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
if (!overwrite_ok(path_name))
goto next;
- if (verbose)
- printf("Restoring %s\n", path_name);
+ pr_verbose(1, "Restoring %s\n", path_name);
if (dry_run)
goto next;
fd = open(path_name, O_CREAT|O_WRONLY, 0644);
@@ -1145,8 +1138,7 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key,
location.objectid = BTRFS_FIRST_FREE_OBJECTID;
}
- if (verbose)
- printf("Restoring %s\n", path_name);
+ pr_verbose(1, "Restoring %s\n", path_name);
errno = 0;
if (dry_run)
@@ -1209,8 +1201,7 @@ next:
}
}
- if (verbose)
- printf("Done searching %s\n", in_dir);
+ pr_verbose(1, "Done searching %s\n", in_dir);
out:
btrfs_release_path(&path);
return ret;
@@ -1420,6 +1411,8 @@ static const char * const cmd_restore_usage[] = {
" you have to use following syntax (possibly quoted):",
" ^/(|home(|/username(|/Desktop(|/.*))))$",
"-c ignore case (--path-regex only)",
+ HELPINFO_GLOBAL_OPTIONS_HEADER,
+ HELPINFO_INSERT_VERBOSE,
NULL
};
@@ -1441,6 +1434,10 @@ static int cmd_restore(const struct cmd_struct *cmd, int argc, char **argv)
regex_t match_reg, *mreg = NULL;
char reg_err[256];
+ /* Init global verbose if unset */
+ if (bconf.verbose < 0)
+ bconf.verbose = 0;
+
optind = 0;
while (1) {
int opt;
@@ -1472,7 +1469,7 @@ static int cmd_restore(const struct cmd_struct *cmd, int argc, char **argv)
get_snaps = 1;
break;
case 'v':
- verbose++;
+ bconf.verbose++;
break;
case 'i':
ignore_errors = 1;
--
1.8.3.1
next prev parent reply other threads:[~2019-11-04 6:34 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 6:32 [PATCH v1.1 00/18] btrfs-progs: global verbose and quiet option Anand Jain
2019-11-04 6:32 ` [PATCH v1 01/18] btrfs-progs: receive: fix option quiet Anand Jain
2019-11-04 6:33 ` [PATCH v1 02/18] btrfs-progs: balance status: fix usage show long verbose Anand Jain
2019-11-04 6:33 ` [PATCH v1 03/18] btrfs-progs: balance start: fix usage add " Anand Jain
2019-11-04 6:33 ` [PATCH v1.1 04/18] btrfs-progs: add global verbose and quiet options and helper functions Anand Jain
2019-11-14 16:08 ` David Sterba
2019-11-19 2:44 ` Anand Jain
2019-11-19 3:36 ` Anand Jain
2019-11-19 16:51 ` David Sterba
2019-11-25 10:36 ` Anand Jain
2019-11-15 15:58 ` David Sterba
2019-11-19 5:07 ` Anand Jain
2019-11-19 17:02 ` David Sterba
2019-11-04 6:33 ` [PATCH v1.1 05/18] btrfs-progs: send: use global verbose and quiet options Anand Jain
2019-11-04 6:33 ` [PATCH v1.1 06/18] btrfs-progs: receive: " Anand Jain
2019-11-04 6:33 ` [PATCH v1.1 07/18] btrfs-progs: subvolume delete: use global verbose option Anand Jain
2019-11-04 6:33 ` [PATCH v1 08/18] btrfs-progs: filesystem defragment: " Anand Jain
2019-11-14 16:16 ` David Sterba
2019-11-25 10:35 ` Anand Jain
2019-11-04 6:33 ` [PATCH v1 09/18] btrfs-progs: balance start: " Anand Jain
2019-11-04 6:33 ` [PATCH v1 10/18] btrfs-progs: balance status: " Anand Jain
2019-11-04 6:33 ` [PATCH v1 11/18] btrfs-progs: rescue chunk-recover: " Anand Jain
2019-11-04 6:33 ` [PATCH v1 12/18] btrfs-progs: rescue super-recover: " Anand Jain
2019-11-04 6:33 ` Anand Jain [this message]
2019-11-04 6:33 ` [PATCH v1 14/18] btrfs-progs: inspect-internal inode-resolve: use global verbose Anand Jain
2019-11-04 6:33 ` [PATCH v1 15/18] btrfs-progs: inspect-internal logical-resolve: use global verbose option Anand Jain
2019-11-04 6:33 ` [PATCH v1.1 16/18] btrfs-progs: refactor btrfs_scan_devices() to accept verbose argument Anand Jain
2019-11-04 6:33 ` [PATCH v1 17/18] btrfs-progs: device scan: add verbose option Anand Jain
2019-11-04 6:33 ` [PATCH v1.1 18/18] btrfs-progs: device scan: add quiet option Anand Jain
2019-11-15 16:11 ` [PATCH v1.1 00/18] btrfs-progs: global verbose and " David Sterba
2019-11-19 3:50 ` 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=1572849196-21775-14-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.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).