diff options
| author | David Sterba <dsterba@suse.com> | 2016-01-12 13:35:50 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-01-12 15:02:55 +0100 |
| commit | ac4ec4d4f44e67fc3d1fd806cf7acbe2485cedee (patch) | |
| tree | 434f39155069a914bc76d3e9fdca87a331012b7a /cmds-replace.c | |
| parent | 633dc6f80f201afdf5b8524ae377187d58f0ef3b (diff) | |
btrfs-progs: check for negative return value from ioctl
Handle only negative values returned by ioctl syscalls, with exception
of the device remove. It returns positive values that are handled later.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'cmds-replace.c')
| -rw-r--r-- | cmds-replace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds-replace.c b/cmds-replace.c index 1ff028a0..6036e2f9 100644 --- a/cmds-replace.c +++ b/cmds-replace.c @@ -166,7 +166,7 @@ static int cmd_replace_start(int argc, char **argv) status_args.cmd = BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS; status_args.result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT; ret = ioctl(fdmnt, BTRFS_IOC_DEV_REPLACE, &status_args); - if (ret) { + if (ret < 0) { fprintf(stderr, "ERROR: ioctl(DEV_REPLACE_STATUS) failed on \"%s\": %s", path, strerror(errno)); @@ -276,7 +276,7 @@ static int cmd_replace_start(int argc, char **argv) start_args.result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT; ret = ioctl(fdmnt, BTRFS_IOC_DEV_REPLACE, &start_args); if (do_not_background) { - if (ret) { + if (ret < 0) { fprintf(stderr, "ERROR: ioctl(DEV_REPLACE_START) failed on \"%s\": %s", path, strerror(errno)); @@ -372,7 +372,7 @@ static int print_replace_status(int fd, const char *path, int once) args.cmd = BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS; args.result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT; ret = ioctl(fd, BTRFS_IOC_DEV_REPLACE, &args); - if (ret) { + if (ret < 0) { fprintf(stderr, "ERROR: ioctl(DEV_REPLACE_STATUS) failed on \"%s\": %s", path, strerror(errno)); if (args.result != BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT) @@ -522,7 +522,7 @@ static int cmd_replace_cancel(int argc, char **argv) ret = ioctl(fd, BTRFS_IOC_DEV_REPLACE, &args); e = errno; close_file_or_dir(fd, dirstream); - if (ret) { + if (ret < 0) { fprintf(stderr, "ERROR: ioctl(DEV_REPLACE_CANCEL) failed on \"%s\": %s", path, strerror(e)); if (args.result != BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT) |