From 7b81119b1d3904cf00ec29140e8bc5d86a12902f Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 4 Mar 2013 16:35:42 -0600 Subject: btrfs-progs: Issue warnings if ioctls fail in sigint handlers The two sigint handlers issue ioctls to clean up, but if they fail, noone would know. I'm not sure there is any other error handling to be done at this point, but a notification seems wise. Signed-off-by: Eric Sandeen --- cmds-replace.c | 5 ++++- cmds-scrub.c | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cmds-replace.c b/cmds-replace.c index 4cc32df2..10030f64 100644 --- a/cmds-replace.c +++ b/cmds-replace.c @@ -77,10 +77,13 @@ static int is_numerical(const char *str) static int dev_replace_cancel_fd = -1; static void dev_replace_sigint_handler(int signal) { + int ret; struct btrfs_ioctl_dev_replace_args args = {0}; args.cmd = BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL; - ioctl(dev_replace_cancel_fd, BTRFS_IOC_DEV_REPLACE, &args); + ret = ioctl(dev_replace_cancel_fd, BTRFS_IOC_DEV_REPLACE, &args); + if (ret < 0) + perror("Device replace cancel failed"); } static int dev_replace_handle_sigint(int fd) diff --git a/cmds-scrub.c b/cmds-scrub.c index da4120f8..6fcff8b4 100644 --- a/cmds-scrub.c +++ b/cmds-scrub.c @@ -287,7 +287,11 @@ static void free_history(struct scrub_file_record **last_scrubs) static int cancel_fd = -1; static void scrub_sigint_record_progress(int signal) { - ioctl(cancel_fd, BTRFS_IOC_SCRUB_CANCEL, NULL); + int ret; + + ret = ioctl(cancel_fd, BTRFS_IOC_SCRUB_CANCEL, NULL); + if (ret < 0) + perror("Scrub cancel failed"); } static int scrub_handle_sigint_parent(void) -- cgit v1.2.3