marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add error processing for btrfsctl -a 

brfsctl -a will do nothing and no error is output 
if btrfs.ko is not inserted.

Since no caller do error processing for btrfs_register_one_device,
make its return void and do error processing inside.

Signed-off-by: Shen Feng <shen@cn.fujitsu.com>
master
Shen Feng 2009-01-07 14:57:11 -05:00 committed by Chris Mason
parent 52b14673e6
commit 2e1ca67177
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
utils.c
View File

@ -645,19 +645,26 @@ struct pending_dir {
char name[256];
};
int btrfs_register_one_device(char *fname)
void btrfs_register_one_device(char *fname)
{
struct btrfs_ioctl_vol_args args;
int fd;
int ret;
fd = open("/dev/btrfs-control", O_RDONLY);
if (fd < 0)
return -EINVAL;
if (fd < 0) {
fprintf(stderr, "failed to open"
"/dev/btrfs-control\n");
exit(1);
}
strcpy(args.name, fname);
ret = ioctl(fd, BTRFS_IOC_SCAN_DEV, &args);
close(fd);
return ret;
if (ret < 0) {
fprintf(stderr, "failed to register device %s\n",
fname);
exit(1);
}
}
int btrfs_scan_one_dir(char *dirname, int run_ioctl)

2
utils.h
View File

@ -34,7 +34,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
u32 sectorsize);
int btrfs_scan_for_fsid(struct btrfs_fs_devices *fs_devices, u64 total_devs,
int run_ioctls);
int btrfs_register_one_device(char *fname);
void btrfs_register_one_device(char *fname);
int btrfs_scan_one_dir(char *dirname, int run_ioctl);
int check_mounted(char *devicename);
int btrfs_device_already_in_root(struct btrfs_root *root, int fd,