From e92d6d861f646e33ae899a5c9189db96d15f8bf5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 14 Jun 2010 15:58:15 -0700 Subject: [PATCH] Update linux-kernel-module with refreshed EXPORT_SYMBOLs After such a large update many of the symbols which were previously exported are no longer available, and several new symbols have been added and are needed. Refresh to topic branch to reflect this. --- module/nvpair/nvpair.c | 5 +++- module/zcommon/zfs_comutil.c | 4 +++ module/zcommon/zprop_common.c | 11 ++++---- module/zfs/dmu_objset.c | 51 +++++++++++++++++------------------ module/zfs/dsl_dataset.c | 11 +++----- module/zfs/spa.c | 15 +++++++---- module/zfs/spa_history.c | 3 ++- module/zfs/spa_misc.c | 22 ++++++++++++--- module/zfs/txg.c | 2 -- 9 files changed, 73 insertions(+), 51 deletions(-) diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c index d98ca4d941..4edc5a4dc9 100644 --- a/module/nvpair/nvpair.c +++ b/module/nvpair/nvpair.c @@ -3348,9 +3348,13 @@ EXPORT_SYMBOL(nvlist_add_int64_array); EXPORT_SYMBOL(nvlist_add_uint64_array); EXPORT_SYMBOL(nvlist_add_string_array); EXPORT_SYMBOL(nvlist_add_nvlist_array); +EXPORT_SYMBOL(nvlist_next_nvpair); +EXPORT_SYMBOL(nvlist_prev_nvpair); +EXPORT_SYMBOL(nvlist_empty); EXPORT_SYMBOL(nvlist_add_hrtime); EXPORT_SYMBOL(nvlist_remove); +EXPORT_SYMBOL(nvlist_remove_nvpair); EXPORT_SYMBOL(nvlist_remove_all); EXPORT_SYMBOL(nvlist_lookup_boolean); @@ -3385,7 +3389,6 @@ EXPORT_SYMBOL(nvlist_lookup_nvpair); EXPORT_SYMBOL(nvlist_exists); /* processing nvpair */ -EXPORT_SYMBOL(nvlist_next_nvpair); EXPORT_SYMBOL(nvpair_name); EXPORT_SYMBOL(nvpair_type); EXPORT_SYMBOL(nvpair_value_boolean_value); diff --git a/module/zcommon/zfs_comutil.c b/module/zcommon/zfs_comutil.c index 797cab7a14..ccf169be6d 100644 --- a/module/zcommon/zfs_comutil.c +++ b/module/zcommon/zfs_comutil.c @@ -203,4 +203,8 @@ const char *zfs_history_event_names[LOG_END] = { #if defined(_KERNEL) && defined(HAVE_SPL) EXPORT_SYMBOL(zfs_allocatable_devs); +EXPORT_SYMBOL(zpool_get_rewind_policy); +EXPORT_SYMBOL(zfs_zpl_version_map); +EXPORT_SYMBOL(zfs_spa_version_map); +EXPORT_SYMBOL(zfs_history_event_names); #endif diff --git a/module/zcommon/zprop_common.c b/module/zcommon/zprop_common.c index 9d2e1c82ff..ab5b4662b7 100644 --- a/module/zcommon/zprop_common.c +++ b/module/zcommon/zprop_common.c @@ -427,17 +427,18 @@ zprop_width(int prop, boolean_t *fixed, zfs_type_t type) #if defined(_KERNEL) && defined(HAVE_SPL) /* Common routines to initialize property tables */ -EXPORT_SYMBOL(register_impl); -EXPORT_SYMBOL(register_string); -EXPORT_SYMBOL(register_number); -EXPORT_SYMBOL(register_index); -EXPORT_SYMBOL(register_hidden); +EXPORT_SYMBOL(zprop_register_impl); +EXPORT_SYMBOL(zprop_register_string); +EXPORT_SYMBOL(zprop_register_number); +EXPORT_SYMBOL(zprop_register_index); +EXPORT_SYMBOL(zprop_register_hidden); /* Common routines for zfs and zpool property management */ EXPORT_SYMBOL(zprop_iter_common); EXPORT_SYMBOL(zprop_name_to_prop); EXPORT_SYMBOL(zprop_string_to_index); EXPORT_SYMBOL(zprop_index_to_string); +EXPORT_SYMBOL(zprop_random_value); EXPORT_SYMBOL(zprop_values); EXPORT_SYMBOL(zprop_valid_for_type); #endif diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index 3ced910049..629cba64a6 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -1686,35 +1686,34 @@ dmu_objset_get_user(objset_t *os) } #if defined(_KERNEL) && defined(HAVE_SPL) -EXPORT_SYMBOL(dmu_objset_spa); -EXPORT_SYMBOL(dmu_objset_zil); -EXPORT_SYMBOL(dmu_objset_pool); -EXPORT_SYMBOL(dmu_objset_ds); -EXPORT_SYMBOL(dmu_objset_name); -EXPORT_SYMBOL(dmu_objset_type); -EXPORT_SYMBOL(dmu_objset_id); -EXPORT_SYMBOL(dmu_snapshot_list_next); -EXPORT_SYMBOL(dmu_dir_list_next); -EXPORT_SYMBOL(dmu_objset_set_user); -EXPORT_SYMBOL(dmu_objset_get_user); - -/* Public routines to create, destroy, open, and close objsets. */ -EXPORT_SYMBOL(dmu_objset_open); -EXPORT_SYMBOL(dmu_objset_open_ds); -EXPORT_SYMBOL(dmu_objset_close); -EXPORT_SYMBOL(dmu_objset_evict_dbufs); +EXPORT_SYMBOL(dmu_objset_hold); +EXPORT_SYMBOL(dmu_objset_own); +EXPORT_SYMBOL(dmu_objset_rele); +EXPORT_SYMBOL(dmu_objset_disown); +EXPORT_SYMBOL(dmu_objset_from_ds); EXPORT_SYMBOL(dmu_objset_create); -EXPORT_SYMBOL(dmu_objset_create_impl); +EXPORT_SYMBOL(dmu_objset_clone); EXPORT_SYMBOL(dmu_objset_destroy); -EXPORT_SYMBOL(dmu_snapshots_destroy); -EXPORT_SYMBOL(dmu_objset_rollback); EXPORT_SYMBOL(dmu_objset_snapshot); -EXPORT_SYMBOL(dmu_objset_rename); -EXPORT_SYMBOL(dmu_objset_find); -EXPORT_SYMBOL(dmu_objset_byteswap); - -/* Get stats on a dataset. */ -EXPORT_SYMBOL(dmu_objset_fast_stat); EXPORT_SYMBOL(dmu_objset_stats); +EXPORT_SYMBOL(dmu_objset_fast_stat); EXPORT_SYMBOL(dmu_objset_space); +EXPORT_SYMBOL(dmu_objset_fsid_guid); +EXPORT_SYMBOL(dmu_objset_find); +EXPORT_SYMBOL(dmu_objset_find_spa); +EXPORT_SYMBOL(dmu_objset_prefetch); +EXPORT_SYMBOL(dmu_objset_byteswap); +EXPORT_SYMBOL(dmu_objset_evict_dbufs); +EXPORT_SYMBOL(dmu_objset_snap_cmtime); + +EXPORT_SYMBOL(dmu_objset_sync); +EXPORT_SYMBOL(dmu_objset_is_dirty); +EXPORT_SYMBOL(dmu_objset_create_impl); +EXPORT_SYMBOL(dmu_objset_open_impl); +EXPORT_SYMBOL(dmu_objset_evict); +EXPORT_SYMBOL(dmu_objset_do_userquota_updates); +EXPORT_SYMBOL(dmu_objset_userquota_get_ids); +EXPORT_SYMBOL(dmu_objset_userused_enabled); +EXPORT_SYMBOL(dmu_objset_userspace_upgrade); +EXPORT_SYMBOL(dmu_objset_userspace_present); #endif diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c index 8bbbb0815c..8cde8537f4 100644 --- a/module/zfs/dsl_dataset.c +++ b/module/zfs/dsl_dataset.c @@ -3935,12 +3935,13 @@ EXPORT_SYMBOL(dsl_dataset_destroy_check); EXPORT_SYMBOL(dsl_dataset_destroy_sync); EXPORT_SYMBOL(dsl_dataset_snapshot_check); EXPORT_SYMBOL(dsl_dataset_snapshot_sync); -EXPORT_SYMBOL(dsl_dataset_rollback); EXPORT_SYMBOL(dsl_dataset_rename); EXPORT_SYMBOL(dsl_dataset_promote); EXPORT_SYMBOL(dsl_dataset_clone_swap); -EXPORT_SYMBOL(dsl_dataset_set_user_ptr); -EXPORT_SYMBOL(dsl_dataset_get_user_ptr); +EXPORT_SYMBOL(dsl_dataset_user_hold); +EXPORT_SYMBOL(dsl_dataset_user_release); +EXPORT_SYMBOL(dsl_dataset_user_release_tmp); +EXPORT_SYMBOL(dsl_dataset_get_holds); EXPORT_SYMBOL(dsl_dataset_get_blkptr); EXPORT_SYMBOL(dsl_dataset_set_blkptr); EXPORT_SYMBOL(dsl_dataset_get_spa); @@ -3960,9 +3961,5 @@ EXPORT_SYMBOL(dsl_dataset_check_quota); EXPORT_SYMBOL(dsl_dataset_set_quota); EXPORT_SYMBOL(dsl_dataset_set_quota_sync); EXPORT_SYMBOL(dsl_dataset_set_reservation); -EXPORT_SYMBOL(dsl_dataset_user_hold); -EXPORT_SYMBOL(dsl_dataset_user_release); -EXPORT_SYMBOL(dsl_dataset_user_release_tmp); -EXPORT_SYMBOL(dsl_dataset_get_holds); EXPORT_SYMBOL(dsl_destroy_inconsistent); #endif diff --git a/module/zfs/spa.c b/module/zfs/spa.c index f81fd50bd6..7aa4667548 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -5703,9 +5703,12 @@ done: #if defined(_KERNEL) && defined(HAVE_SPL) /* state manipulation functions */ EXPORT_SYMBOL(spa_open); +EXPORT_SYMBOL(spa_open_rewind); EXPORT_SYMBOL(spa_get_stats); EXPORT_SYMBOL(spa_create); +EXPORT_SYMBOL(spa_import_rootpool); EXPORT_SYMBOL(spa_import); +EXPORT_SYMBOL(spa_import_verbatim); EXPORT_SYMBOL(spa_tryimport); EXPORT_SYMBOL(spa_destroy); EXPORT_SYMBOL(spa_export); @@ -5715,6 +5718,8 @@ EXPORT_SYMBOL(spa_async_suspend); EXPORT_SYMBOL(spa_async_resume); EXPORT_SYMBOL(spa_inject_addref); EXPORT_SYMBOL(spa_inject_delref); +EXPORT_SYMBOL(spa_scan_stat_init); +EXPORT_SYMBOL(spa_scan_get_stats); /* device maniion */ EXPORT_SYMBOL(spa_vdev_add); @@ -5722,6 +5727,8 @@ EXPORT_SYMBOL(spa_vdev_attach); EXPORT_SYMBOL(spa_vdev_detach); EXPORT_SYMBOL(spa_vdev_remove); EXPORT_SYMBOL(spa_vdev_setpath); +EXPORT_SYMBOL(spa_vdev_setfru); +EXPORT_SYMBOL(spa_vdev_split_mirror); /* spare statech is global across all pools) */ EXPORT_SYMBOL(spa_spare_add); @@ -5735,10 +5742,10 @@ EXPORT_SYMBOL(spa_l2cache_remove); EXPORT_SYMBOL(spa_l2cache_exists); EXPORT_SYMBOL(spa_l2cache_activate); EXPORT_SYMBOL(spa_l2cache_drop); -EXPORT_SYMBOL(spa_l2cache_space_update); -/* scrubbing */ -EXPORT_SYMBOL(spa_scrub); +/* scanning */ +EXPORT_SYMBOL(spa_scan); +EXPORT_SYMBOL(spa_scan_stop); /* spa syncing */ EXPORT_SYMBOL(spa_sync); /* only for DMU use */ @@ -5749,8 +5756,6 @@ EXPORT_SYMBOL(spa_prop_set); EXPORT_SYMBOL(spa_prop_get); EXPORT_SYMBOL(spa_prop_clear_bootfs); -#if defined(HAVE_SYSEVENT) /* asynchronous event notification */ EXPORT_SYMBOL(spa_event_notify); #endif -#endif diff --git a/module/zfs/spa_history.c b/module/zfs/spa_history.c index 7eb928519f..99e2eaa739 100644 --- a/module/zfs/spa_history.c +++ b/module/zfs/spa_history.c @@ -509,5 +509,6 @@ spa_history_log_version(spa_t *spa, history_internal_events_t event) EXPORT_SYMBOL(spa_history_create_obj); EXPORT_SYMBOL(spa_history_get); EXPORT_SYMBOL(spa_history_log); -EXPORT_SYMBOL(spa_history_internal_log); +EXPORT_SYMBOL(spa_history_log_internal); +EXPORT_SYMBOL(spa_history_log_version); #endif diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c index 724b0a17a5..3472dacb1b 100644 --- a/module/zfs/spa_misc.c +++ b/module/zfs/spa_misc.c @@ -1711,16 +1711,24 @@ EXPORT_SYMBOL(spa_name); EXPORT_SYMBOL(spa_guid); EXPORT_SYMBOL(spa_last_synced_txg); EXPORT_SYMBOL(spa_first_txg); +EXPORT_SYMBOL(spa_syncing_txg); EXPORT_SYMBOL(spa_version); EXPORT_SYMBOL(spa_state); +EXPORT_SYMBOL(spa_load_state); EXPORT_SYMBOL(spa_freeze_txg); -EXPORT_SYMBOL(spa_get_alloc); -EXPORT_SYMBOL(spa_get_space); -EXPORT_SYMBOL(spa_get_dspace); EXPORT_SYMBOL(spa_get_asize); +EXPORT_SYMBOL(spa_get_dspace); +EXPORT_SYMBOL(spa_update_dspace); +EXPORT_SYMBOL(spa_deflate); +EXPORT_SYMBOL(spa_normal_class); +EXPORT_SYMBOL(spa_log_class); EXPORT_SYMBOL(spa_max_replication); +EXPORT_SYMBOL(spa_prev_software_version); EXPORT_SYMBOL(spa_get_failmode); EXPORT_SYMBOL(spa_suspended); +EXPORT_SYMBOL(spa_bootfs); +EXPORT_SYMBOL(spa_delegation); +EXPORT_SYMBOL(spa_meta_objset); /* Miscellaneous support routines */ EXPORT_SYMBOL(spa_rename); @@ -1728,15 +1736,21 @@ EXPORT_SYMBOL(spa_guid_exists); EXPORT_SYMBOL(spa_strdup); EXPORT_SYMBOL(spa_strfree); EXPORT_SYMBOL(spa_get_random); +EXPORT_SYMBOL(spa_generate_guid); EXPORT_SYMBOL(sprintf_blkptr); EXPORT_SYMBOL(spa_freeze); EXPORT_SYMBOL(spa_upgrade); EXPORT_SYMBOL(spa_evict_all); EXPORT_SYMBOL(spa_lookup_by_guid); EXPORT_SYMBOL(spa_has_spare); -EXPORT_SYMBOL(bp_get_dasize); +EXPORT_SYMBOL(dva_get_dsize_sync); +EXPORT_SYMBOL(bp_get_dsize_sync); +EXPORT_SYMBOL(bp_get_dsize); EXPORT_SYMBOL(spa_has_slogs); EXPORT_SYMBOL(spa_is_root); +EXPORT_SYMBOL(spa_writeable); +EXPORT_SYMBOL(spa_rewind_data_to_nvlist); +EXPORT_SYMBOL(spa_mode); EXPORT_SYMBOL(spa_namespace_lock); #endif diff --git a/module/zfs/txg.c b/module/zfs/txg.c index 7fc90f91bd..3382629b00 100644 --- a/module/zfs/txg.c +++ b/module/zfs/txg.c @@ -732,8 +732,6 @@ EXPORT_SYMBOL(txg_hold_open); EXPORT_SYMBOL(txg_rele_to_quiesce); EXPORT_SYMBOL(txg_rele_to_sync); EXPORT_SYMBOL(txg_register_callbacks); -EXPORT_SYMBOL(txg_suspend); -EXPORT_SYMBOL(txg_resume); EXPORT_SYMBOL(txg_delay); EXPORT_SYMBOL(txg_wait_synced); EXPORT_SYMBOL(txg_wait_open);