Author: marius
Date: Tue May 3 20:13:27 2011
New Revision: 221409
URL: http://svn.freebsd.org/changeset/base/221409
Log:
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
Modified:
head/sys/cddl/compat/opensolaris/sys/systm.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Modified: head/sys/cddl/compat/opensolaris/sys/systm.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/systm.h Tue May 3 19:51:56
2011 (r221408)
+++ head/sys/cddl/compat/opensolaris/sys/systm.h Tue May 3 20:13:27
2011 (r221409)
@@ -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_ */
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 May
3 19:51:56 2011 (r221408)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Tue May
3 20:13:27 2011 (r221409)
@@ -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);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
