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

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 <sandeen@redhat.com>
master
Eric Sandeen 2013-03-04 16:35:42 -06:00 committed by David Sterba
parent 06efd54588
commit 7b81119b1d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmds-replace.c
View File

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

6
cmds-scrub.c
View File

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