[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Move initializati...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5dcff8c111ac
branches:  trunk
changeset: 336783:5dcff8c111ac
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Mar 19 17:16:22 2015 +0000

description:
Move initialization of XUIO_XUZC_PRIV out of #ifdef PORT_SOLARIS.

This code is not currently used, so no functional change, but it may
be used when we hook zfs into the ubc.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r e3b452029f2a -r 5dcff8c111ac external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c  Thu Mar 19 14:24:55 2015 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c  Thu Mar 19 17:16:22 2015 +0000
@@ -679,14 +679,15 @@
        priv->cnt = nblk;
        priv->bufs = kmem_zalloc(nblk * sizeof (arc_buf_t *), KM_SLEEP);
        priv->iovp = uio->uio_iov;
-#ifdef PORT_SOLARIS
        XUIO_XUZC_PRIV(xuio) = priv;
 
+#ifdef PORT_SOLARIS
        if (XUIO_XUZC_RW(xuio) == UIO_READ)
                XUIOSTAT_INCR(xuiostat_onloan_rbuf, nblk);
        else
                XUIOSTAT_INCR(xuiostat_onloan_wbuf, nblk);
 #endif
+
        return (0);
 }
 
@@ -699,12 +700,13 @@
        kmem_free(priv->iovp, nblk * sizeof (iovec_t));
        kmem_free(priv->bufs, nblk * sizeof (arc_buf_t *));
        kmem_free(priv, sizeof (dmu_xuio_t));
+
 #ifdef PORT_SOLARIS
        if (XUIO_XUZC_RW(xuio) == UIO_READ)
                XUIOSTAT_INCR(xuiostat_onloan_rbuf, -nblk);
        else
                XUIOSTAT_INCR(xuiostat_onloan_wbuf, -nblk);
-#endif 
+#endif
 }
 
 /*