@@ -24,7 +24,7 @@ Recover the chunk tree by scanning the devices
-y::::
assume an answer of 'yes' to all questions.
-v::::
-verbose mode.
+verbose mode. This option is merged to the global verbose option.
-h::::
help.
@@ -194,8 +194,7 @@ static struct btrfs_chunk *create_chunk_item(struct chunk_record *record)
return ret;
}
-static void init_recover_control(struct recover_control *rc, int verbose,
- int yes)
+static void init_recover_control(struct recover_control *rc, int yes)
{
memset(rc, 0, sizeof(struct recover_control));
cache_tree_init(&rc->chunk);
@@ -208,7 +207,7 @@ static void init_recover_control(struct recover_control *rc, int verbose,
INIT_LIST_HEAD(&rc->rebuild_chunks);
INIT_LIST_HEAD(&rc->unrepaired_chunks);
- rc->verbose = verbose;
+ rc->verbose = bconf.verbose;
rc->yes = yes;
pthread_mutex_init(&rc->rc_lock, NULL);
}
@@ -2319,14 +2318,14 @@ static void validate_rebuild_chunks(struct recover_control *rc)
/*
* Return 0 when successful, < 0 on error and > 0 if aborted by user
*/
-int btrfs_recover_chunk_tree(const char *path, int verbose, int yes)
+int btrfs_recover_chunk_tree(const char *path, int yes)
{
int ret = 0;
struct btrfs_root *root = NULL;
struct btrfs_trans_handle *trans;
struct recover_control rc;
- init_recover_control(&rc, verbose, yes);
+ init_recover_control(&rc, yes);
ret = recover_prepare(&rc, path);
if (ret) {
@@ -38,8 +38,11 @@ static const char * const cmd_rescue_chunk_recover_usage[] = {
"Recover the chunk tree by scanning the devices one by one.",
"",
"-y Assume an answer of `yes' to all questions",
- "-v Verbose mode",
+ "-v Verbose mode. This option is merged to the global verbose",
+ " option",
"-h Help",
+ HELPINFO_INSERT_GLOBALS,
+ HELPINFO_INSERT_VERBOSE,
NULL
};
@@ -49,7 +52,10 @@ static int cmd_rescue_chunk_recover(const struct cmd_struct *cmd,
int ret = 0;
char *file;
int yes = 0;
- int verbose = 0;
+
+ /* If verbose is unset, set it to 0 */
+ if (bconf.verbose == BTRFS_BCONF_UNSET)
+ bconf.verbose = BTRFS_BCONF_QUIET;
optind = 0;
while (1) {
@@ -61,7 +67,7 @@ static int cmd_rescue_chunk_recover(const struct cmd_struct *cmd,
yes = 1;
break;
case 'v':
- verbose = 1;
+ bconf.verbose++;
break;
default:
usage_unknown_option(cmd, argv);
@@ -83,7 +89,7 @@ static int cmd_rescue_chunk_recover(const struct cmd_struct *cmd,
return 1;
}
- ret = btrfs_recover_chunk_tree(file, verbose, yes);
+ ret = btrfs_recover_chunk_tree(file, yes);
if (!ret) {
fprintf(stdout, "Chunk tree recovered successfully\n");
} else if (ret > 0) {
@@ -16,6 +16,6 @@
#define __BTRFS_RESCUE_H__
int btrfs_recover_superblocks(const char *path, int verbose, int yes);
-int btrfs_recover_chunk_tree(const char *path, int verbose, int yes);
+int btrfs_recover_chunk_tree(const char *path, int yes);
#endif
Transpire global --verbose option down to the btrfs rescue chunk-recover sub-command. For example: Both global and local verbose options are now supported. btrfs -v|--verbose rescue chunk-recover btrfs rescue chunk-recover -v Suggested-by: David Sterba <dsterba@suse.com> Signed-off-by: Anand Jain <anand.jain@oracle.com> --- v3: update help and documentation v2: Use new helper functions and defines HELPINFO_INSERT_GLOBALS, BTRFS_BCONF_UNSET, BTRFS_BCONF_QUIET bconf_be_verbose(), bconf_be_quiet() Drop verbose argument in init_recover_control() Documentation/btrfs-rescue.asciidoc | 2 +- cmds/rescue-chunk-recover.c | 9 ++++----- cmds/rescue.c | 14 ++++++++++---- cmds/rescue.h | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-)