From 6104e13be6ccd83fad00a130bc5fa952673e9781 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 16 Jun 2010 09:59:39 -0700 Subject: [PATCH] Add linux-spa-thread topic branch Disable the spa thread under Linux until it can be implemented. --- .topdeps | 3 +-- .topmsg | 17 ++--------------- module/zfs/spa.c | 4 +++- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.topdeps b/.topdeps index ff8849266b..7f16cbcdd5 100644 --- a/.topdeps +++ b/.topdeps @@ -1,2 +1 @@ -gcc-branch -fix-branch +zfs-branch diff --git a/.topmsg b/.topmsg index 03967cdff5..26d41d79e2 100644 --- a/.topmsg +++ b/.topmsg @@ -1,19 +1,6 @@ From: Brian Behlendorf -Subject: [PATCH] zfs branch +Subject: [PATCH] linux spa thread -Merged result of all changes which are relevant to both Solaris -and Linux builds of the ZFS code. These are changes where there -is a reasonable chance they will be accepted upstream. - -Additionally, since this is effectively the root of the linux -ZFS tree the core linux build system is added here. This -includes autogen.sh, configure.ac, m4 macros, some scripts/*, -and makefiles for all the core ZFS components. Linux-only -features which require tweaks to the build system should appear -on the relevant topic branches. All autotools products which -result from autogen.sh are commited to the linux-configure-branch. - -This branch also contains the META, ChangeLog, AUTHORS, TODO, -and README, files. +Disable the spa thread under Linux until it can be implemented. Signed-off-by: Brian Behlendorf diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 6b90cc2309..376a4b7ae4 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -669,7 +669,7 @@ spa_create_zio_taskqs(spa_t *spa) } } -#ifdef _KERNEL +#if defined(_KERNEL) && defined(HAVE_SPA_THREAD) static void spa_thread(void *arg) { @@ -759,6 +759,7 @@ spa_activate(spa_t *spa, int mode) ASSERT(spa->spa_proc == &p0); spa->spa_did = 0; +#ifdef HAVE_SPA_THREAD /* 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, @@ -779,6 +780,7 @@ spa_activate(spa_t *spa, int mode) #endif } } +#endif /* HAVE_SPA_THREAD */ mutex_exit(&spa->spa_proc_lock); /* If we didn't create a process, we need to create our taskqs. */