From owner-svn-src-head@FreeBSD.ORG  Tue Apr  2 08:15:40 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7C9EB8CA;
 Tue,  2 Apr 2013 08:15:40 +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 6B46EEC2;
 Tue,  2 Apr 2013 08:15:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r328FdPn010339;
 Tue, 2 Apr 2013 08:15:39 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r328FdBY010337;
 Tue, 2 Apr 2013 08:15:39 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201304020815.r328FdBY010337@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 2 Apr 2013 08:15:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249004 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Apr 2013 08:15:40 -0000

Author: mm
Date: Tue Apr  2 08:15:39 2013
New Revision: 249004
URL: http://svnweb.freebsd.org/changeset/base/249004

Log:
  Do not check against uninitialized rc and comment out vendor code
  
  MFC after:	16 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Tue Apr  2 07:28:14 2013	(r249003)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Tue Apr  2 08:15:39 2013	(r249004)
@@ -5713,11 +5713,11 @@ zfsdev_ioctl(struct cdev *dev, u_long zc
 {
 	zfs_cmd_t *zc;
 	uint_t vecnum;
-	int error, rc, len;
 #ifdef illumos
+	int error, rc, len;
 	minor_t minor = getminor(dev);
 #else
-	int cflag, cmd, oldvecnum;
+	int error, len, cflag, cmd, oldvecnum;
 	cred_t *cr = td->td_ucred;
 #endif
 	const zfs_ioc_vec_t *vec;
@@ -5904,8 +5904,11 @@ zfsdev_ioctl(struct cdev *dev, u_long zc
 
 out:
 	nvlist_free(innvl);
+#ifdef illumos
+	rc = ddi_copyout(zc, (void *)arg, sizeof (zfs_cmd_t), flag);
 	if (error == 0 && rc != 0)
 		error = EFAULT;
+#endif
 	if (error == 0 && vec->zvec_allow_log) {
 		char *s = tsd_get(zfs_allow_log_key);
 		if (s != NULL)