RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-23 22:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: refactor btrfs_scan_devices() to accept verbose argument

Browse Source 
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 print the
messages when verbose is enabled by the global option.

Add an option %verbose to btrfs_scan_devices().

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2019-11-25 18:39:15 +08:00 committed by David Sterba
parent 6d022e7af2
commit aeb2242b70
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/device.c
View File

@ -356,7 +356,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,

2
cmds/filesystem.c
View File

@ -747,7 +747,7 @@ devs_only:
else
ret = 1;
} else {
ret = btrfs_scan_devices();
ret = btrfs_scan_devices(0);
}
if (ret) {

3
common/device-scan.c
View File

@ -360,7 +360,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 +404,7 @@ int btrfs_scan_devices(void)
close (fd);
continue;
}
pr_verbose(verbose, "registered: %s\n", path);
close(fd);
}

2
common/device-scan.h
View File

@ -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,

2
common/utils.c
View File

@ -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;
}

2
disk-io.c
View File

@ -1124,7 +1124,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;
}