d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Comment out unfeasible illumos copyin code and restore previous behavior.

Browse Source
This commit is contained in:
Martin Matuska 2013-03-07 23:45:16 +00:00
parent b3b6851c78
commit 91edf37414
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
View File

@ -5853,6 +5853,7 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
return (EINVAL);
vec = &zfs_ioc_vec[vecnum];
#ifdef illumos
zc = kmem_zalloc(sizeof(zfs_cmd_t), KM_SLEEP);
bzero(zc, sizeof(zfs_cmd_t));
@ -5861,11 +5862,15 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
error = EFAULT;
goto out;
}
#endif
if (cflag != ZFS_CMD_COMPAT_NONE) {
zc = kmem_zalloc(sizeof(zfs_cmd_t), KM_SLEEP);
bzero(zc, sizeof(zfs_cmd_t));
zfs_cmd_compat_get(zc, arg, cflag);
zfs_ioctl_compat_pre(zc, &vecnum, cflag);
}
} else
zc = (void *)arg;
zc->zc_iflags = flag & FKIOCTL;
if (zc->zc_nvlist_src_size != 0) {
@ -5983,9 +5988,12 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
if (cflag != ZFS_CMD_COMPAT_NONE) {
zfs_ioctl_compat_post(zc, cmd, cflag);
zfs_cmd_compat_put(zc, arg, cflag);
kmem_free(zc, sizeof (zfs_cmd_t));
}
#ifdef illumos
kmem_free(zc, sizeof (zfs_cmd_t));
#endif
return (error);
}