c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 02:49:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove useless variable spa_active_count

Browse Source 
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 <he.huang@intel.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3262
This commit is contained in:
Isaac Huang 2015-04-25 22:25:45 -06:00 committed by Brian Behlendorf
parent c5656c4cfc
commit 0336f3d001
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sys/spa.h
View File

@ -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 metaslab_class_t *spa_log_class(spa_t *spa);
extern int spa_max_replication(spa_t *spa); extern int spa_max_replication(spa_t *spa);
extern int spa_prev_software_version(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 uint8_t spa_get_failmode(spa_t *spa);
extern boolean_t spa_suspended(spa_t *spa); extern boolean_t spa_suspended(spa_t *spa);
extern uint64_t spa_bootfs(spa_t *spa); extern uint64_t spa_bootfs(spa_t *spa);

9
module/zfs/spa_misc.c
View File

@ -227,7 +227,6 @@
static avl_tree_t spa_namespace_avl; static avl_tree_t spa_namespace_avl;
kmutex_t spa_namespace_lock; kmutex_t spa_namespace_lock;
static kcondvar_t spa_namespace_cv; static kcondvar_t spa_namespace_cv;
static int spa_active_count;
int spa_max_replication_override = SPA_DVAS_PER_BP; int spa_max_replication_override = SPA_DVAS_PER_BP;
static kmutex_t spa_spare_lock; 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. * Set the alternate root, if there is one.
*/ */
if (altroot) { if (altroot)
spa->spa_root = spa_strdup(altroot); spa->spa_root = spa_strdup(altroot);
spa_active_count++;
}
/* /*
* Every pool starts with the default cachefile * Every pool starts with the default cachefile
@ -628,10 +625,8 @@ spa_remove(spa_t *spa)
avl_remove(&spa_namespace_avl, spa); avl_remove(&spa_namespace_avl, spa);
cv_broadcast(&spa_namespace_cv); cv_broadcast(&spa_namespace_cv);
if (spa->spa_root) { if (spa->spa_root)
spa_strfree(spa->spa_root); spa_strfree(spa->spa_root);
spa_active_count--;
}
while ((dp = list_head(&spa->spa_config_list)) != NULL) { while ((dp = list_head(&spa->spa_config_list)) != NULL) {
list_remove(&spa->spa_config_list, dp); list_remove(&spa->spa_config_list, dp);