Function btrfs_scan_devices() is being used by commands such as 'btrfs filesystem' and 'btrfs device', by having the verbose argument in the btrfs_scan_devices() we can control which threads to show the verbose when verbose is enabled by the global verbose option.
So add an option %verbose to btrfs_scan_devices(). Signed-off-by: Anand Jain <anand.j...@oracle.com> --- cmds/device.c | 2 +- cmds/filesystem.c | 2 +- common/device-scan.c | 4 +++- common/device-scan.h | 2 +- common/utils.c | 2 +- disk-io.c | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cmds/device.c b/cmds/device.c index 24158308a41b..b429a169cd5d 100644 --- a/cmds/device.c +++ b/cmds/device.c @@ -354,7 +354,7 @@ static int cmd_device_scan(const struct cmd_struct *cmd, int argc, char **argv) } } else { printf("Scanning for Btrfs filesystems\n"); - ret = btrfs_scan_devices(); + ret = btrfs_scan_devices(false); error_on(ret, "error %d while scanning", ret); ret = btrfs_register_all_devices(); error_on(ret, diff --git a/cmds/filesystem.c b/cmds/filesystem.c index ee4d366fbf64..fb6e2e998dcf 100644 --- a/cmds/filesystem.c +++ b/cmds/filesystem.c @@ -746,7 +746,7 @@ devs_only: else ret = 1; } else { - ret = btrfs_scan_devices(); + ret = btrfs_scan_devices(false); } if (ret) { diff --git a/common/device-scan.c b/common/device-scan.c index 48dbd9e19715..a5963d789f49 100644 --- a/common/device-scan.c +++ b/common/device-scan.c @@ -26,6 +26,7 @@ #include <linux/limits.h> #include <blkid/blkid.h> #include <uuid/uuid.h> +#include <stdbool.h> #include "kernel-lib/overflow.h" #include "common/path-utils.h" #include "common/device-scan.h" @@ -360,7 +361,7 @@ void free_seen_fsid(struct seen_fsid *seen_fsid_hash[]) } } -int btrfs_scan_devices(void) +int btrfs_scan_devices(bool verbose) { int fd = -1; int ret; @@ -404,6 +405,7 @@ int btrfs_scan_devices(void) close (fd); continue; } + pr_verbose(verbose, "registered: %s\n", path); close(fd); } diff --git a/common/device-scan.h b/common/device-scan.h index eda2bae5c6c4..c50fe2fbf91f 100644 --- a/common/device-scan.h +++ b/common/device-scan.h @@ -29,7 +29,7 @@ struct seen_fsid { int fd; }; -int btrfs_scan_devices(void); +int btrfs_scan_devices(bool verbose); int btrfs_register_one_device(const char *fname); int btrfs_register_all_devices(void); int btrfs_add_to_fsid(struct btrfs_trans_handle *trans, diff --git a/common/utils.c b/common/utils.c index 6617b3ef38b1..9027de596f5d 100644 --- a/common/utils.c +++ b/common/utils.c @@ -277,7 +277,7 @@ int check_mounted_where(int fd, const char *file, char *where, int size, /* scan other devices */ if (is_btrfs && total_devs > 1) { - ret = btrfs_scan_devices(); + ret = btrfs_scan_devices(false); if (ret) return ret; } diff --git a/disk-io.c b/disk-io.c index a9744af90a43..33bd003167fe 100644 --- a/disk-io.c +++ b/disk-io.c @@ -1100,7 +1100,7 @@ int btrfs_scan_fs_devices(int fd, const char *path, } if (!skip_devices && total_devs != 1) { - ret = btrfs_scan_devices(); + ret = btrfs_scan_devices(false); if (ret) return ret; } -- 1.8.3.1