d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not check against uninitialized rc and comment out vendor code

Browse Source 
MFC after:	16 days
This commit is contained in:
Martin Matuska 2013-04-02 08:15:39 +00:00
parent c23a9d98bf
commit 41451f4a0e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
View File

@ -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)