svn commit: r247862 - projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Wed Mar  6 01:21:56 2013
New Revision: 247862
URL: http://svnweb.freebsd.org/changeset/base/247862

Log:
  Diff reduction with 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 00:36:33 2013	(r247861)
+++ projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Wed Mar  6 01:21:56 2013	(r247862)
@@ -5801,11 +5801,11 @@ zfsdev_ioctl(struct cdev *dev, u_long zc
 {
 	zfs_cmd_t *zc;
 	uint_t vecnum;
-#ifdef illumos
 	int error, rc, len;
+#ifdef illumos
 	minor_t minor = getminor(dev);
 #else
-	int cflag, cmd, error, rc, len;
+	int cflag, cmd;
 	cred_t *cr = td->td_ucred;
 #endif
 	const zfs_ioc_vec_t *vec;
@@ -5989,7 +5989,7 @@ out:
 		zfs_cmd_compat_put(zc, addr, cflag);
 	}
 
-	kmem_free(zc, sizeof(zfs_cmd_t));
+	kmem_free(zc, sizeof (zfs_cmd_t));
 	return (error);
 }