cmd_scan_dev() has it own code to register device (calling ioctl
BTRFS_IOC_SCAN_DEV), apparently it could use btrfs_register_one_device().
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
static int cmd_scan_dev(int argc, char **argv)
{
static int cmd_scan_dev(int argc, char **argv)
{
int devstart = 1;
int all = 0;
int ret = 0;
int devstart = 1;
int all = 0;
int ret = 0;
- fd = open("/dev/btrfs-control", O_RDWR);
- if (fd < 0) {
- perror("failed to open /dev/btrfs-control");
- ret = 1;
- goto out;
- }
-
for( i = devstart ; i < argc ; i++ ){
for( i = devstart ; i < argc ; i++ ){
- struct btrfs_ioctl_vol_args args;
char *path;
if (!is_block_device(argv[i])) {
fprintf(stderr,
"ERROR: %s is not a block device\n", argv[i]);
ret = 1;
char *path;
if (!is_block_device(argv[i])) {
fprintf(stderr,
"ERROR: %s is not a block device\n", argv[i]);
ret = 1;
}
path = canonicalize_path(argv[i]);
if (!path) {
}
path = canonicalize_path(argv[i]);
if (!path) {
"ERROR: Could not canonicalize path '%s': %s\n",
argv[i], strerror(errno));
ret = 1;
"ERROR: Could not canonicalize path '%s': %s\n",
argv[i], strerror(errno));
ret = 1;
}
printf("Scanning for Btrfs filesystems in '%s'\n", path);
}
printf("Scanning for Btrfs filesystems in '%s'\n", path);
-
- strncpy_null(args.name, path);
- /*
- * FIXME: which are the error code returned by this ioctl ?
- * it seems that is impossible to understand if there no is
- * a btrfs filesystem from an I/O error !!!
- */
- ret = ioctl(fd, BTRFS_IOC_SCAN_DEV, &args);
- e = errno;
-
- if( ret < 0 ){
- fprintf(stderr, "ERROR: unable to scan the device '%s' - %s\n",
- path, strerror(e));
+ if (btrfs_register_one_device(path) != 0) {
+ ret = 1;
-void btrfs_register_one_device(char *fname)
+int btrfs_register_one_device(const char *fname)
{
struct btrfs_ioctl_vol_args args;
int fd;
{
struct btrfs_ioctl_vol_args args;
int fd;
fprintf(stderr, "failed to open /dev/btrfs-control "
"skipping device registration: %s\n",
strerror(errno));
fprintf(stderr, "failed to open /dev/btrfs-control "
"skipping device registration: %s\n",
strerror(errno));
}
strncpy(args.name, fname, BTRFS_PATH_NAME_MAX);
args.name[BTRFS_PATH_NAME_MAX-1] = 0;
ret = ioctl(fd, BTRFS_IOC_SCAN_DEV, &args);
e = errno;
}
strncpy(args.name, fname, BTRFS_PATH_NAME_MAX);
args.name[BTRFS_PATH_NAME_MAX-1] = 0;
ret = ioctl(fd, BTRFS_IOC_SCAN_DEV, &args);
e = errno;
fprintf(stderr, "ERROR: device scan failed '%s' - %s\n",
fname, strerror(e));
fprintf(stderr, "ERROR: device scan failed '%s' - %s\n",
fname, strerror(e));
}
int btrfs_device_already_in_root(struct btrfs_root *root, int fd,
}
int btrfs_device_already_in_root(struct btrfs_root *root, int fd,
u64 block_count, u32 io_width, u32 io_align,
u32 sectorsize);
int btrfs_scan_for_fsid(int run_ioctls);
u64 block_count, u32 io_width, u32 io_align,
u32 sectorsize);
int btrfs_scan_for_fsid(int run_ioctls);
-void btrfs_register_one_device(char *fname);
+int btrfs_register_one_device(const char *fname);
char *canonicalize_dm_name(const char *ptname);
char *canonicalize_path(const char *path);
int check_mounted(const char *devicename);
char *canonicalize_dm_name(const char *ptname);
char *canonicalize_path(const char *path);
int check_mounted(const char *devicename);