From owner-svn-src-projects@FreeBSD.ORG Wed Mar 6 11:33:26 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7DD7817E; Wed, 6 Mar 2013 11:33:26 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 579EF340; Wed, 6 Mar 2013 11:33:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r26BXQ92094198; Wed, 6 Mar 2013 11:33:26 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r26BXQMp094197; Wed, 6 Mar 2013 11:33:26 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201303061133.r26BXQMp094197@svn.freebsd.org> From: Martin Matuska Date: Wed, 6 Mar 2013 11:33:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r247890 - projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Mar 2013 11:33:26 -0000 Author: mm Date: Wed Mar 6 11:33:25 2013 New Revision: 247890 URL: http://svnweb.freebsd.org/changeset/base/247890 Log: Add missing init functions Reduce diff to illumos Modified: projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Modified: projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed Mar 6 11:11:18 2013 (r247889) +++ projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Wed Mar 6 11:33:25 2013 (r247890) @@ -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 zc 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 @@ out: 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, voi 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, voi tsd_destroy(&zfs_fsyncer_key); tsd_destroy(&rrw_tsd_key); + tsd_destroy(&zfs_allow_log_key); mutex_destroy(&zfs_share_lock); break;