[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Fix spa_thread to...

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

details:   https://anonhg.NetBSD.org/src/rev/9a177c981d56
branches:  trunk
changeset: 754720:9a177c981d56
user:      haad <haad%NetBSD.org@localhost>
date:      Mon May 10 06:15:28 2010 +0000

description:
Fix spa_thread to compile under the NetBSD.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/spa.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r a7e1af03c2b7 -r 9a177c981d56 external/cddl/osnet/dist/uts/common/fs/zfs/spa.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c  Mon May 10 06:10:59 2010 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c  Mon May 10 06:15:28 2010 +0000
@@ -1,3 +1,4 @@
+
 /*
  * CDDL HEADER START
  *
@@ -671,13 +672,14 @@
        callb_cpr_t cprinfo;
 
        spa_t *spa = arg;
-#ifdef PORT_SOLARIS
-       user_t *pu = PTOU(curproc);
 
        CALLB_CPR_INIT(&cprinfo, &spa->spa_proc_lock, callb_generic_cpr,
            spa->spa_name);
 
        ASSERT(curproc != &p0);
+#ifdef PORT_SOLARIS
+       user_t *pu = PTOU(curproc);
+
        (void) snprintf(pu->u_psargs, sizeof (pu->u_psargs),
            "zpool-%s", spa->spa_name);
        (void) strlcpy(pu->u_comm, pu->u_psargs, sizeof (pu->u_comm));
@@ -753,7 +755,7 @@
        ASSERT(spa->spa_proc_state == SPA_PROC_NONE);
        ASSERT(spa->spa_proc == &p0);
        spa->spa_did = 0;
-
+#if 0
        /* Only create a process if we're going to be around a while. */
        if (spa_create_process && strcmp(spa->spa_name, TRYIMPORT_NAME) != 0) {
                if (newproc(spa_thread, (caddr_t)spa, syscid, maxclsyspri,
@@ -773,7 +775,8 @@
                            spa->spa_name);
 #endif
                }
-       }
+       }       
+#endif
        mutex_exit(&spa->spa_proc_lock);
 
        /* If we didn't create a process, we need to create our taskqs. */