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

This commit is contained in:
Brian Behlendorf 2009-03-11 16:28:04 -07:00
commit 4a737ceb71
3 changed files with 13 additions and 1 deletions

View File

@ -1295,4 +1295,5 @@ EXPORT_SYMBOL(dmu_objset_byteswap);
/* Get stats on a dataset. */ /* Get stats on a dataset. */
EXPORT_SYMBOL(dmu_objset_fast_stat); EXPORT_SYMBOL(dmu_objset_fast_stat);
EXPORT_SYMBOL(dmu_objset_stats); EXPORT_SYMBOL(dmu_objset_stats);
EXPORT_SYMBOL(dmu_objset_space);
#endif #endif

View File

@ -1077,4 +1077,5 @@ EXPORT_SYMBOL(dmu_tx_abort);
EXPORT_SYMBOL(dmu_tx_assign); EXPORT_SYMBOL(dmu_tx_assign);
EXPORT_SYMBOL(dmu_tx_wait); EXPORT_SYMBOL(dmu_tx_wait);
EXPORT_SYMBOL(dmu_tx_commit); EXPORT_SYMBOL(dmu_tx_commit);
EXPORT_SYMBOL(dmu_tx_get_txg);
#endif #endif

View File

@ -1108,7 +1108,17 @@ zap_get_stats(objset_t *os, uint64_t zapobj, zap_stats_t *zs)
} }
#if defined(_KERNEL) && defined(HAVE_SPL) #if defined(_KERNEL) && defined(HAVE_SPL)
EXPORT_SYMBOL(zap_update); EXPORT_SYMBOL(zap_add);
EXPORT_SYMBOL(zap_create);
EXPORT_SYMBOL(zap_cursor_advance);
EXPORT_SYMBOL(zap_cursor_fini);
EXPORT_SYMBOL(zap_cursor_init);
EXPORT_SYMBOL(zap_cursor_init_serialized);
EXPORT_SYMBOL(zap_cursor_move_to_key);
EXPORT_SYMBOL(zap_cursor_retrieve);
EXPORT_SYMBOL(zap_cursor_serialize);
EXPORT_SYMBOL(zap_lookup); EXPORT_SYMBOL(zap_lookup);
EXPORT_SYMBOL(zap_lookup_norm); EXPORT_SYMBOL(zap_lookup_norm);
EXPORT_SYMBOL(zap_remove);
EXPORT_SYMBOL(zap_update);
#endif #endif