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)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
