From owner-svn-src-projects@FreeBSD.ORG Thu Mar 7 23:45:17 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 4D426B1A; Thu, 7 Mar 2013 23:45:17 +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 3575CB12; Thu, 7 Mar 2013 23:45:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r27NjHRG058584; Thu, 7 Mar 2013 23:45:17 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r27NjH3Q058582; Thu, 7 Mar 2013 23:45:17 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201303072345.r27NjH3Q058582@svn.freebsd.org> From: Martin Matuska Date: Thu, 7 Mar 2013 23:45:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r247976 - 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: Thu, 07 Mar 2013 23:45:17 -0000 Author: mm Date: Thu Mar 7 23:45:16 2013 New Revision: 247976 URL: http://svnweb.freebsd.org/changeset/base/247976 Log: Comment out unfeasible illumos copyin code and restore previous behavior. 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 Thu Mar 7 23:44:35 2013 (r247975) +++ projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Thu Mar 7 23:45:16 2013 (r247976) @@ -5853,6 +5853,7 @@ zfsdev_ioctl(struct cdev *dev, u_long zc 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 zc 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 @@ out: 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); }