Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-06-16 10:01:06 -07:00
commit 3fe3e41259
1 changed files with 3 additions and 1 deletions

View File

@ -672,7 +672,7 @@ spa_create_zio_taskqs(spa_t *spa)
} }
} }
#ifdef _KERNEL #if defined(_KERNEL) && defined(HAVE_SPA_THREAD)
static void static void
spa_thread(void *arg) spa_thread(void *arg)
{ {
@ -762,6 +762,7 @@ spa_activate(spa_t *spa, int mode)
ASSERT(spa->spa_proc == &p0); ASSERT(spa->spa_proc == &p0);
spa->spa_did = 0; spa->spa_did = 0;
#ifdef HAVE_SPA_THREAD
/* Only create a process if we're going to be around a while. */ /* 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 (spa_create_process && strcmp(spa->spa_name, TRYIMPORT_NAME) != 0) {
if (newproc(spa_thread, (caddr_t)spa, syscid, maxclsyspri, if (newproc(spa_thread, (caddr_t)spa, syscid, maxclsyspri,
@ -782,6 +783,7 @@ spa_activate(spa_t *spa, int mode)
#endif #endif
} }
} }
#endif /* HAVE_SPA_THREAD */
mutex_exit(&spa->spa_proc_lock); mutex_exit(&spa->spa_proc_lock);
/* If we didn't create a process, we need to create our taskqs. */ /* If we didn't create a process, we need to create our taskqs. */