Module Name: src
Committed By: riastradh
Date: Sat Apr 11 00:23:31 UTC 2015
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: dmu.c
Log Message:
Disable another xuio branch.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c:1.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c:1.4 Thu Mar 19 17:16:22 2015
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c Sat Apr 11 00:23:31 2015
@@ -807,8 +807,10 @@ dmu_read_uio(objset_t *os, uint64_t obje
if (err)
return (err);
+#ifndef __NetBSD__ /* XXX xuio */
if (uio->uio_extflg == UIO_XUIO)
xuio = (xuio_t *)uio;
+#endif
for (i = 0; i < numbufs; i++) {
int tocpy;
