Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Add linux-spa-thread topic branch 

Disable the spa thread under Linux until it can be implemented.
This commit is contained in:
Brian Behlendorf 2010-06-16 09:59:39 -07:00
parent b41c7ff877
commit 6104e13be6
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.topdeps
View File

@ -1,2 +1 @@
gcc-branch zfs-branch
fix-branch

17
.topmsg
View File

@ -1,19 +1,6 @@
From: Brian Behlendorf <behlendorf1@llnl.gov> From: Brian Behlendorf <behlendorf1@llnl.gov>
Subject: [PATCH] zfs branch Subject: [PATCH] linux spa thread
Merged result of all changes which are relevant to both Solaris Disable the spa thread under Linux until it can be implemented.
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.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

4
module/zfs/spa.c
View File

@ -669,7 +669,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)
{ {
@ -759,6 +759,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,
@ -779,6 +780,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. */