diff options
author | Shen Feng <shen@cn.fujitsu.com> | 2009-01-07 14:57:11 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2009-01-07 14:57:11 -0500 |
commit | 2e1ca671776434e65c4b1b1d2b62de8d9cb13d35 (patch) | |
tree | 10b1ae5ce546b32728eabcd7d260c317b1efc49a | |
parent | 52b14673e66f1feb09a4cc2e83fac2a365fcde53 (diff) |
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>
-rw-r--r-- | utils.c | 15 | ||||
-rw-r--r-- | utils.h | 2 |
2 files changed, 12 insertions, 5 deletions
@@ -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) @@ -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, |