[RFC PATCH 11/14] btrfs-progs: migrate inspect-internal inode-resolve to global verbose

Anand Jain
2019-10-21T10:01:54Z

Command btrfs inspect-internal inode-resolve provides verbose option at
the sub-command level, this patch makes it enable-able by using the
global --verbose option.

Suggested-by: David Sterba <dsterba@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
cmds/inspect.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmds/inspect.c b/cmds/inspect.c
index 758b6e60c591..f872b471b420 100644
--- a/cmds/inspect.c
+++ b/cmds/inspect.c
@@ -33,6 +33,8 @@
#include "btrfs-list.h"
#include "common/help.h"

+extern bool global_verbose;
+
static const char * const inspect_cmd_group_usage[] = {
"btrfs inspect-internal <command> <args>",
NULL
@@ -56,8 +58,8 @@ static int __ino_to_path_fd(u64 inum, int fd, int verbose, const char *prepend)
goto out;
}

- if (verbose)
- printf("ioctl ret=%d, bytes_left=%lu, bytes_missing=%lu, "
+ pr_verbose(global_verbose,
+ "ioctl ret=%d, bytes_left=%lu, bytes_missing=%lu, "
"cnt=%d, missed=%d\n", ret,
(unsigned long)fspath->bytes_left,
(unsigned long)fspath->bytes_missing,
@@ -83,7 +85,7 @@ static const char * const cmd_inspect_inode_resolve_usage[] = {
"btrfs inspect-internal inode-resolve [-v] <inode> <path>",
"Get file system paths for the given inode",
"",
- "-v verbose mode",
+ HELPINFO_INSERT_VERBOSE_SHORT,
NULL
};

@@ -91,7 +93,6 @@ static int cmd_inspect_inode_resolve(const struct cmd_struct *cmd,
int argc, char **argv)
{
int fd;
- int verbose = 0;
int ret;
DIR *dirstream = NULL;

@@ -103,7 +104,7 @@ static int cmd_inspect_inode_resolve(const struct cmd_struct *cmd,

switch (c) {
case 'v':
- verbose = 1;
+ global_verbose = true;
break;
default:
usage_unknown_option(cmd, argv);
@@ -117,8 +118,8 @@ static int cmd_inspect_inode_resolve(const struct cmd_struct *cmd,
if (fd < 0)
return 1;

- ret = __ino_to_path_fd(arg_strtou64(argv[optind]), fd, verbose,
- argv[optind+1]);
+ ret = __ino_to_path_fd(arg_strtou64(argv[optind]), fd,
+ global_verbose ? 1 : 0, argv[optind+1]);
close_file_or_dir(fd, dirstream);
return !!ret;

--
1.8.3.1