aboutsummaryrefslogtreecommitdiff
path: root/module/zfs/zfs_ioctl.c
diff options
context:
space:
mode:
authorPawel Jakub Dawidek <pawel@dawidek.net>2020-06-08 20:57:22 +0000
committerGitHub <noreply@github.com>2020-06-08 20:57:22 +0000
commit529246df96e2838b18592ed18628d2a122828be8 (patch)
tree071fc2524233adc65c4f734ae42276fd3fdaa53a /module/zfs/zfs_ioctl.c
parent77b998fa7018801426a6e216a462c83699fa9f44 (diff)
downloadsrc-529246df96e2838b18592ed18628d2a122828be8.tar.gz
src-529246df96e2838b18592ed18628d2a122828be8.zip
Restore support for in-kernel ZFS ioctls
In Illumos it is possible to call ioctl functions from within the kernel by passing the FKIOCTL flag. Neither FreeBSD nor Linux support that, but it doesn't hurt to keep it around, as all the code is there. Before this commit it was a dead code and zc_iflags was always zero. Restore this functionality by allowing to pass a flag to the zfsdev_ioctl_common() function. Reviewed-by: Ryan Moeller <ryan@iXsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Pawel Jakub Dawidek <pawel@dawidek.net> Closes #10417
Diffstat (limited to 'module/zfs/zfs_ioctl.c')
-rw-r--r--module/zfs/zfs_ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 6e7e9b9f099c..8b6dca18c1b1 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -7375,9 +7375,9 @@ zfsdev_minor_alloc(void)
}
long
-zfsdev_ioctl_common(uint_t vecnum, zfs_cmd_t *zc)
+zfsdev_ioctl_common(uint_t vecnum, zfs_cmd_t *zc, int flag)
{
- int error, cmd, flag = 0;
+ int error, cmd;
const zfs_ioc_vec_t *vec;
char *saved_poolname = NULL;
nvlist_t *innvl = NULL;