diff options
| author | marius <marius@FreeBSD.org> | 2011-05-03 20:13:27 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2011-05-03 20:13:27 +0000 |
| commit | 4637d40a9961a813f7e15c64d07febef6fc0a395 (patch) | |
| tree | 8444b118f9a801a76b6d8bb0ddc9224a8f892e5b /sys/cddl | |
| parent | d0f32374e669176f507d67889e3a92cc6a46232a (diff) | |
| download | FreeBSD-src-4637d40a9961a813f7e15c64d07febef6fc0a395.zip FreeBSD-src-4637d40a9961a813f7e15c64d07febef6fc0a395.tar.gz | |
Convert the last use of xcopyout() to ddi_copyout() and remove the now
unused xcopyin() as well as xcopyout().
MFC together with r219089.
Approved by: mm
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/compat/opensolaris/sys/systm.h | 3 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/cddl/compat/opensolaris/sys/systm.h b/sys/cddl/compat/opensolaris/sys/systm.h index 136960e..fe0e199 100644 --- a/sys/cddl/compat/opensolaris/sys/systm.h +++ b/sys/cddl/compat/opensolaris/sys/systm.h @@ -42,9 +42,6 @@ #define delay(x) pause("soldelay", (x)) -#define xcopyin(u, k, s) copyin(u, k, s) -#define xcopyout(k, u, s) copyout(k, u, s) - #endif /* _KERNEL */ #endif /* _OPENSOLARIS_SYS_SYSTM_H_ */ 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 153f957..f8912ca 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 @@ -4068,9 +4068,9 @@ zfs_ioc_userspace_many(zfs_cmd_t *zc) buf, &zc->zc_nvlist_dst_size); if (error == 0) { - error = xcopyout(buf, + error = ddi_copyout(buf, (void *)(uintptr_t)zc->zc_nvlist_dst, - zc->zc_nvlist_dst_size); + zc->zc_nvlist_dst_size, zc->zc_iflags); } kmem_free(buf, bufsize); zfsvfs_rele(zfsvfs, FTAG); |
