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

Add missing init functions

Browse Source 
Reduce diff to illumos
This commit is contained in:
Martin Matuska 2013-03-06 11:33:25 +00:00
parent db49d41d8a
commit b3b6851c78
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/libzfs_core/; revision=247890
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5796,7 +5796,7 @@ zfsdev_close(void *data)
}
static int
zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t addr, int flag,
zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
struct thread *td)
{
zfs_cmd_t *zc;
@ -5856,18 +5856,14 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t addr, int flag,
zc = kmem_zalloc(sizeof(zfs_cmd_t), KM_SLEEP);
bzero(zc, sizeof(zfs_cmd_t));
#ifdef illumos
error = ddi_copyin((void *)arg, zc, sizeof (zfs_cmd_t), flag);
#else
error = ddi_copyin((void *)addr, zc, sizeof (zfs_cmd_t), flag);
#endif
if (error != 0) {
error = EFAULT;
goto out;
}
if (cflag != ZFS_CMD_COMPAT_NONE) {
zfs_cmd_compat_get(zc, addr, cflag);
zfs_cmd_compat_get(zc, arg, cflag);
zfs_ioctl_compat_pre(zc, &vecnum, cflag);
}
@ -5986,7 +5982,7 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t addr, int flag,
if (cflag != ZFS_CMD_COMPAT_NONE) {
zfs_ioctl_compat_post(zc, cmd, cflag);
zfs_cmd_compat_put(zc, addr, cflag);
zfs_cmd_compat_put(zc, arg, cflag);
}
kmem_free(zc, sizeof (zfs_cmd_t));
@ -6216,9 +6212,11 @@ zfs_modevent(module_t mod, int type, void *unused __unused)
spa_init(FREAD | FWRITE);
zfs_init();
zvol_init();
zfs_ioctl_init();
tsd_create(&zfs_fsyncer_key, NULL);
tsd_create(&rrw_tsd_key, NULL);
tsd_create(&rrw_tsd_key, rrw_tsd_destroy);
tsd_create(&zfs_allow_log_key, zfs_allow_log_destroy);
printf("ZFS storage pool version: features support (" SPA_VERSION_STRING ")\n");
root_mount_rel(zfs_root_token);
@ -6239,6 +6237,7 @@ zfs_modevent(module_t mod, int type, void *unused __unused)
tsd_destroy(&zfs_fsyncer_key);
tsd_destroy(&rrw_tsd_key);
tsd_destroy(&zfs_allow_log_key);
mutex_destroy(&zfs_share_lock);
break;