@@ -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(0);
error_on(ret, "error %d while scanning", ret);
ret = btrfs_register_all_devices();
error_on(ret,
@@ -746,7 +746,7 @@ devs_only:
else
ret = 1;
} else {
- ret = btrfs_scan_devices();
+ ret = btrfs_scan_devices(0);
}
if (ret) {
@@ -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(int 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);
}
@@ -29,7 +29,7 @@ struct seen_fsid {
int fd;
};
-int btrfs_scan_devices(void);
+int btrfs_scan_devices(int 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,
@@ -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(0);
if (ret)
return ret;
}
@@ -1097,7 +1097,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(0);
if (ret)
return ret;
}
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.jain@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(-)