Transpire global --verbose option down to the btrfs balance start
sub-command.
Suggested-by: David Sterba <dsterba@xxxxxxxx>
Signed-off-by: Anand Jain <anand.jain@xxxxxxxxxx>
---
cmds/balance.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/cmds/balance.c b/cmds/balance.c
index a98cd8d6200f..0170fcb7f386 100644
--- a/cmds/balance.c
+++ b/cmds/balance.c
@@ -495,6 +495,8 @@ static const char * const cmd_balance_start_usage[] = {
"--full-balance do not print warning and do not delay start",
"--background|--bg",
" run the balance as a background process",
+ HELPINFO_GLOBAL_OPTIONS_HEADER,
+ HELPINFO_INSERT_VERBOSE,
NULL
};
@@ -505,11 +507,14 @@ static int cmd_balance_start(const struct cmd_struct *cmd,
struct btrfs_balance_args *ptrs[] = { &args.data, &args.sys,
&args.meta, NULL };
int force = 0;
- int verbose = 0;
int background = 0;
unsigned start_flags = 0;
int i;
+ /* If global verbose is unset, set it to 0 */
+ if (bconf.verbose < 0)
+ bconf.verbose = 0;
+
memset(&args, 0, sizeof(args));
optind = 0;
@@ -560,7 +565,7 @@ static int cmd_balance_start(const struct cmd_struct *cmd,
force = 1;
break;
case 'v':
- verbose = 1;
+ bconf.verbose++;
break;
case GETOPT_VAL_FULL_BALANCE:
start_flags |= BALANCE_START_NOWARN;
@@ -636,7 +641,7 @@ static int cmd_balance_start(const struct cmd_struct *cmd,
if (force)
args.flags |= BTRFS_BALANCE_FORCE;
- if (verbose)
+ if (bconf.verbose)
dump_ioctl_balance_args(&args);
if (background) {
switch (fork()) {
--
1.8.3.1
