diff options
| author | mm <mm@FreeBSD.org> | 2013-04-02 08:15:39 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-04-02 08:15:39 +0000 |
| commit | 99022c5e51e2c166c2ef4094c7bac6461faf4a7c (patch) | |
| tree | 2b5ae669da2d046d6e4d5525166050274be68994 /sys/cddl | |
| parent | 0d7093e2ebb8ab652b84870fa383527566d6b707 (diff) | |
| download | FreeBSD-src-99022c5e51e2c166c2ef4094c7bac6461faf4a7c.zip FreeBSD-src-99022c5e51e2c166c2ef4094c7bac6461faf4a7c.tar.gz | |
Do not check against uninitialized rc and comment out vendor code
MFC after: 16 days
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index 8c89e8a..c4d4904 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -5713,11 +5713,11 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag, { 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 zcmd, caddr_t arg, int flag, 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) |
