diff options
Diffstat (limited to 'usr/src/uts/common/fs/zfs/spa_misc.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/spa_misc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr/src/uts/common/fs/zfs/spa_misc.c b/usr/src/uts/common/fs/zfs/spa_misc.c index f414952e92..53a7bb8d23 100644 --- a/usr/src/uts/common/fs/zfs/spa_misc.c +++ b/usr/src/uts/common/fs/zfs/spa_misc.c @@ -56,6 +56,7 @@ #include <sys/arc.h> #include <sys/ddt.h> #include "zfs_prop.h" +#include <sys/btree.h> #include <sys/zfeature.h> /* @@ -600,7 +601,7 @@ spa_log_sm_sort_by_txg(const void *va, const void *vb) const spa_log_sm_t *a = va; const spa_log_sm_t *b = vb; - return (AVL_CMP(a->sls_txg, b->sls_txg)); + return (TREE_CMP(a->sls_txg, b->sls_txg)); } /* @@ -942,7 +943,7 @@ spa_aux_compare(const void *a, const void *b) const spa_aux_t *sa = (const spa_aux_t *)a; const spa_aux_t *sb = (const spa_aux_t *)b; - return (AVL_CMP(sa->aux_guid, sb->aux_guid)); + return (TREE_CMP(sa->aux_guid, sb->aux_guid)); } void @@ -2022,7 +2023,7 @@ spa_name_compare(const void *a1, const void *a2) s = strcmp(s1->spa_name, s2->spa_name); - return (AVL_ISIGN(s)); + return (TREE_ISIGN(s)); } int @@ -2072,8 +2073,8 @@ spa_init(int mode) zfs_refcount_init(); unique_init(); - range_tree_init(); - metaslab_alloc_trace_init(); + zfs_btree_init(); + metaslab_stat_init(); zio_init(); dmu_init(); zil_init(); @@ -2099,8 +2100,8 @@ spa_fini(void) zil_fini(); dmu_fini(); zio_fini(); - metaslab_alloc_trace_fini(); - range_tree_fini(); + metaslab_stat_fini(); + zfs_btree_fini(); unique_fini(); zfs_refcount_fini(); scan_fini(); |