From 0336f3d001c76625281919bcf9e534d1976f3c36 Mon Sep 17 00:00:00 2001 From: Isaac Huang Date: Sat, 25 Apr 2015 22:25:45 -0600 Subject: [PATCH] Remove useless variable spa_active_count This isn't required for the Linux port because the kernel tracks if a module is busy. The prototype for spa_busy() is also removed since its definition was already removed. Signed-off-by: Isaac Huang Signed-off-by: Brian Behlendorf Closes #3262 --- include/sys/spa.h | 1 - module/zfs/spa_misc.c | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/sys/spa.h b/include/sys/spa.h index 83b6723a4f73..d601955131f0 100644 --- a/include/sys/spa.h +++ b/include/sys/spa.h @@ -791,7 +791,6 @@ extern metaslab_class_t *spa_normal_class(spa_t *spa); extern metaslab_class_t *spa_log_class(spa_t *spa); extern int spa_max_replication(spa_t *spa); extern int spa_prev_software_version(spa_t *spa); -extern int spa_busy(void); extern uint8_t spa_get_failmode(spa_t *spa); extern boolean_t spa_suspended(spa_t *spa); extern uint64_t spa_bootfs(spa_t *spa); diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c index 7a96ea18bfc5..33d2d20fd77f 100644 --- a/module/zfs/spa_misc.c +++ b/module/zfs/spa_misc.c @@ -227,7 +227,6 @@ static avl_tree_t spa_namespace_avl; kmutex_t spa_namespace_lock; static kcondvar_t spa_namespace_cv; -static int spa_active_count; int spa_max_replication_override = SPA_DVAS_PER_BP; static kmutex_t spa_spare_lock; @@ -560,10 +559,8 @@ spa_add(const char *name, nvlist_t *config, const char *altroot) /* * Set the alternate root, if there is one. */ - if (altroot) { + if (altroot) spa->spa_root = spa_strdup(altroot); - spa_active_count++; - } /* * Every pool starts with the default cachefile @@ -628,10 +625,8 @@ spa_remove(spa_t *spa) avl_remove(&spa_namespace_avl, spa); cv_broadcast(&spa_namespace_cv); - if (spa->spa_root) { + if (spa->spa_root) spa_strfree(spa->spa_root); - spa_active_count--; - } while ((dp = list_head(&spa->spa_config_list)) != NULL) { list_remove(&spa->spa_config_list, dp);