Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-22 10:23:16 -08:00
commit a9e37c248d
1 changed files with 2 additions and 2 deletions

View File

@ -72,7 +72,7 @@ int zdb_sig_cksumalg = ZIO_CHECKSUM_SHA256;
* debugging facilities. * debugging facilities.
*/ */
const char * const char *
_umem_debug_init() _umem_debug_init(void)
{ {
return ("default,verbose"); /* $UMEM_DEBUG setting */ return ("default,verbose"); /* $UMEM_DEBUG setting */
} }
@ -860,7 +860,7 @@ static avl_tree_t domain_tree;
static boolean_t fuid_table_loaded; static boolean_t fuid_table_loaded;
static void static void
fuid_table_destroy() fuid_table_destroy(void)
{ {
if (fuid_table_loaded) { if (fuid_table_loaded) {
zfs_fuid_table_destroy(&idx_tree, &domain_tree); zfs_fuid_table_destroy(&idx_tree, &domain_tree);