X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzfs_ioctl.c;h=2856ba7c427cd9949f4da42d699ccbf44b8ff64d;hb=3ee56c292bbcd7e6b26e3c2ad8f0e50eee236bcc;hp=221b1e3359257363dc56cd6b40600a111fd16cda;hpb=00b46022c676e402e3f33ce93ee2983bbad2c46f;p=zfs.git diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 221b1e3..2856ba7 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -3291,7 +3291,7 @@ out: dsl_dataset_rele(ds, FTAG); return (error); #else - return (ENOTSUP); + return (EOPNOTSUPP); #endif /* HAVE_ZPL */ } @@ -4741,11 +4741,12 @@ zfs_ioc_events_next(zfs_cmd_t *zc) return (error); do { - error = zfs_zevent_next(ze, &event, &dropped); + error = zfs_zevent_next(ze, &event, + &zc->zc_nvlist_dst_size, &dropped); if (event != NULL) { zc->zc_cookie = dropped; error = put_nvlist(zc, event); - nvlist_free(event); + nvlist_free(event); } if (zc->zc_guid & ZEVENT_NONBLOCK) @@ -5141,7 +5142,7 @@ zfsdev_compat_ioctl(struct file *filp, unsigned cmd, unsigned long arg) return zfsdev_ioctl(filp, cmd, arg); } #else -#define zfs_compat_ioctl NULL +#define zfsdev_compat_ioctl NULL #endif static const struct file_operations zfsdev_fops = {