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

zfs_ioctl: no need for ddi_copyin/out here because sys_ioctl handles that

Browse Source 
On FreeBSD the direct ioctl argument is automatically copied in/out
as necesary by the kernel ioctl entry point.

PR:		kern/164445
Submitted by:	Luis Garces-Erice <lge@ieee.org>
Tested by:	Attila Nagy <bra@fsn.hu>
MFC after:	5 days
This commit is contained in:
Andriy Gapon 2012-04-05 07:59:59 +00:00
parent 59894e4a44
commit 70542ee01f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
View File

@ -293,9 +293,12 @@ zfs_ioctl(vnode_t *vp, u_long com, intptr_t data, int flag, cred_t *cred,
case _FIO_SEEK_DATA:
case _FIO_SEEK_HOLE:
#ifdef sun
if (ddi_copyin((void *)data, &off, sizeof (off), flag))
return (EFAULT);
#else
off = *(offset_t *)data;
#endif
zp = VTOZ(vp);
zfsvfs = zp->z_zfsvfs;
ZFS_ENTER(zfsvfs);
@ -306,8 +309,12 @@ zfs_ioctl(vnode_t *vp, u_long com, intptr_t data, int flag, cred_t *cred,
ZFS_EXIT(zfsvfs);
if (error)
return (error);
#ifdef sun
if (ddi_copyout(&off, (void *)data, sizeof (off), flag))
return (EFAULT);
#else
*(offset_t *)data = off;
#endif
return (0);
}
return (ENOTTY);