Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Use zfs_ioctl() in zinject.c 

Consistently use the `zfs_ioctl()` wrapper since `ioctl()` cannot be
called directly due to differing semantics between platforms.

Follow up PR to #9492.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Jorgen Lundman <lundman@lundman.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #9507
This commit is contained in:
Matthew Macy 2019-10-25 13:50:34 -07:00 committed by Brian Behlendorf
parent 0ee89a1252
commit 24cf9f4eb2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/zinject/zinject.c
View File

@ -340,7 +340,7 @@ iter_handlers(int (*func)(int, const char *, zinject_record_t *, void *),
zfs_cmd_t zc = {"\0"}; zfs_cmd_t zc = {"\0"};
int ret; int ret;
while (ioctl(zfs_fd, ZFS_IOC_INJECT_LIST_NEXT, &zc) == 0) while (zfs_ioctl(g_zfs, ZFS_IOC_INJECT_LIST_NEXT, &zc) == 0)
if ((ret = func((int)zc.zc_guid, zc.zc_name, if ((ret = func((int)zc.zc_guid, zc.zc_name,
&zc.zc_inject_record, data)) != 0) &zc.zc_inject_record, data)) != 0)
return (ret); return (ret);
@ -508,7 +508,7 @@ cancel_one_handler(int id, const char *pool, zinject_record_t *record,
zc.zc_guid = (uint64_t)id; zc.zc_guid = (uint64_t)id;
if (ioctl(zfs_fd, ZFS_IOC_CLEAR_FAULT, &zc) != 0) { if (zfs_ioctl(g_zfs, ZFS_IOC_CLEAR_FAULT, &zc) != 0) {
(void) fprintf(stderr, "failed to remove handler %d: %s\n", (void) fprintf(stderr, "failed to remove handler %d: %s\n",
id, strerror(errno)); id, strerror(errno));
return (1); return (1);
@ -541,7 +541,7 @@ cancel_handler(int id)
zc.zc_guid = (uint64_t)id; zc.zc_guid = (uint64_t)id;
if (ioctl(zfs_fd, ZFS_IOC_CLEAR_FAULT, &zc) != 0) { if (zfs_ioctl(g_zfs, ZFS_IOC_CLEAR_FAULT, &zc) != 0) {
(void) fprintf(stderr, "failed to remove handler %d: %s\n", (void) fprintf(stderr, "failed to remove handler %d: %s\n",
id, strerror(errno)); id, strerror(errno));
return (1); return (1);
@ -565,7 +565,7 @@ register_handler(const char *pool, int flags, zinject_record_t *record,
zc.zc_inject_record = *record; zc.zc_inject_record = *record;
zc.zc_guid = flags; zc.zc_guid = flags;
if (ioctl(zfs_fd, ZFS_IOC_INJECT_FAULT, &zc) != 0) { if (zfs_ioctl(g_zfs, ZFS_IOC_INJECT_FAULT, &zc) != 0) {
(void) fprintf(stderr, "failed to add handler: %s\n", (void) fprintf(stderr, "failed to add handler: %s\n",
errno == EDOM ? "block level exceeds max level of object" : errno == EDOM ? "block level exceeds max level of object" :
strerror(errno)); strerror(errno));
@ -625,7 +625,7 @@ perform_action(const char *pool, zinject_record_t *record, int cmd)
zc.zc_guid = record->zi_guid; zc.zc_guid = record->zi_guid;
zc.zc_cookie = cmd; zc.zc_cookie = cmd;
if (ioctl(zfs_fd, ZFS_IOC_VDEV_SET_STATE, &zc) == 0) if (zfs_ioctl(g_zfs, ZFS_IOC_VDEV_SET_STATE, &zc) == 0)
return (0); return (0);
return (1); return (1);