X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fptlrpc_module.c;h=1026e4862c3c7ab393dcd8f530f7e70ad5578d02;hp=d4101073f4dda875663c0f8426fe35aa2a13d9d3;hb=08aa217ce49aba1ded52e0f7adb8a607035123fd;hpb=1d1c177f6bf3cd0201a1b5da726e529950fe8bf4 diff --git a/lustre/ptlrpc/ptlrpc_module.c b/lustre/ptlrpc/ptlrpc_module.c index d410107..1026e48 100644 --- a/lustre/ptlrpc/ptlrpc_module.c +++ b/lustre/ptlrpc/ptlrpc_module.c @@ -27,16 +27,13 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ * Lustre is a trademark of Sun Microsystems, Inc. */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_RPC #ifndef __KERNEL__ @@ -50,13 +47,13 @@ #include "ptlrpc_internal.h" -extern cfs_spinlock_t ptlrpc_last_xid_lock; +extern spinlock_t ptlrpc_last_xid_lock; #if RS_DEBUG -extern cfs_spinlock_t ptlrpc_rs_debug_lock; +extern spinlock_t ptlrpc_rs_debug_lock; #endif -extern cfs_spinlock_t ptlrpc_all_services_lock; -extern cfs_mutex_t pinger_mutex; -extern cfs_mutex_t ptlrpcd_mutex; +extern spinlock_t ptlrpc_all_services_lock; +extern struct mutex pinger_mutex; +extern struct mutex ptlrpcd_mutex; __init int ptlrpc_init(void) { @@ -65,11 +62,11 @@ __init int ptlrpc_init(void) lustre_assert_wire_constants(); #if RS_DEBUG - cfs_spin_lock_init(&ptlrpc_rs_debug_lock); + spin_lock_init(&ptlrpc_rs_debug_lock); #endif - cfs_spin_lock_init(&ptlrpc_all_services_lock); - cfs_mutex_init(&pinger_mutex); - cfs_mutex_init(&ptlrpcd_mutex); + spin_lock_init(&ptlrpc_all_services_lock); + mutex_init(&pinger_mutex); + mutex_init(&ptlrpcd_mutex); ptlrpc_init_xid(); rc = req_layout_init(); @@ -113,10 +110,20 @@ __init int ptlrpc_init(void) if (rc) GOTO(cleanup, rc); +#ifdef __KERNEL__ + cleanup_phase = 7; + rc = tgt_mod_init(); + if (rc) + GOTO(cleanup, rc); +#endif RETURN(0); cleanup: switch(cleanup_phase) { +#ifdef __KERNEL__ + case 7: + llog_recov_fini(); +#endif case 6: sptlrpc_fini(); case 5: @@ -139,6 +146,7 @@ cleanup: #ifdef __KERNEL__ static void __exit ptlrpc_exit(void) { + tgt_mod_exit(); llog_recov_fini(); sptlrpc_fini(); ldlm_exit(); @@ -148,206 +156,6 @@ static void __exit ptlrpc_exit(void) ptlrpc_connection_fini(); } -/* connection.c */ -EXPORT_SYMBOL(ptlrpc_connection_get); -EXPORT_SYMBOL(ptlrpc_connection_put); -EXPORT_SYMBOL(ptlrpc_connection_addref); -EXPORT_SYMBOL(ptlrpc_connection_init); -EXPORT_SYMBOL(ptlrpc_connection_fini); - -/* niobuf.c */ -#ifdef HAVE_SERVER_SUPPORT -EXPORT_SYMBOL(ptlrpc_prep_bulk_exp); -EXPORT_SYMBOL(ptlrpc_start_bulk_transfer); -EXPORT_SYMBOL(ptlrpc_abort_bulk); -#endif -EXPORT_SYMBOL(ptlrpc_register_bulk); -EXPORT_SYMBOL(ptlrpc_unregister_bulk); -EXPORT_SYMBOL(ptlrpc_send_reply); -EXPORT_SYMBOL(ptlrpc_reply); -EXPORT_SYMBOL(ptlrpc_send_error); -EXPORT_SYMBOL(ptlrpc_error); -EXPORT_SYMBOL(ptlrpc_resend_req); -EXPORT_SYMBOL(ptl_send_rpc); - -/* client.c */ -EXPORT_SYMBOL(ptlrpc_init_client); -EXPORT_SYMBOL(ptlrpc_cleanup_client); -EXPORT_SYMBOL(ptlrpc_uuid_to_connection); -EXPORT_SYMBOL(ptlrpc_queue_wait); -EXPORT_SYMBOL(ptlrpc_replay_req); -EXPORT_SYMBOL(ptlrpc_restart_req); -EXPORT_SYMBOL(ptlrpc_add_rqs_to_pool); -EXPORT_SYMBOL(ptlrpc_init_rq_pool); -EXPORT_SYMBOL(ptlrpc_free_rq_pool); -EXPORT_SYMBOL(ptlrpc_prep_req_pool); -EXPORT_SYMBOL(ptlrpc_prep_fakereq); -EXPORT_SYMBOL(ptlrpc_fakereq_finished); -EXPORT_SYMBOL(ptlrpc_at_set_req_timeout); -EXPORT_SYMBOL(ptlrpc_request_alloc); -EXPORT_SYMBOL(ptlrpc_request_alloc_pool); -EXPORT_SYMBOL(ptlrpc_request_free); -EXPORT_SYMBOL(ptlrpc_request_pack); -EXPORT_SYMBOL(ptlrpc_request_alloc_pack); -EXPORT_SYMBOL(ptlrpc_prep_req); -EXPORT_SYMBOL(ptlrpc_unregister_reply); -EXPORT_SYMBOL(ptlrpc_req_finished); -EXPORT_SYMBOL(ptlrpc_req_finished_with_imp_lock); -EXPORT_SYMBOL(ptlrpc_request_addref); -EXPORT_SYMBOL(ptlrpc_prep_bulk_imp); -EXPORT_SYMBOL(ptlrpc_free_bulk); -EXPORT_SYMBOL(ptlrpc_prep_bulk_page); -EXPORT_SYMBOL(ptlrpc_abort_inflight); -EXPORT_SYMBOL(ptlrpc_cleanup_imp); -EXPORT_SYMBOL(ptlrpc_retain_replayable_request); -EXPORT_SYMBOL(ptlrpc_next_xid); -EXPORT_SYMBOL(ptlrpc_req_set_repsize); -EXPORT_SYMBOL(ptlrpc_request_set_replen); - -EXPORT_SYMBOL(ptlrpc_prep_set); -EXPORT_SYMBOL(ptlrpc_set_add_cb); -EXPORT_SYMBOL(ptlrpc_set_add_req); -EXPORT_SYMBOL(ptlrpc_set_add_new_req); -EXPORT_SYMBOL(ptlrpc_set_destroy); -EXPORT_SYMBOL(ptlrpc_set_next_timeout); -EXPORT_SYMBOL(ptlrpc_check_set); -EXPORT_SYMBOL(ptlrpc_set_wait); -EXPORT_SYMBOL(ptlrpc_expired_set); -EXPORT_SYMBOL(ptlrpc_interrupted_set); -EXPORT_SYMBOL(ptlrpc_mark_interrupted); - -/* service.c */ -EXPORT_SYMBOL(ptlrpc_save_lock); -EXPORT_SYMBOL(ptlrpc_schedule_difficult_reply); -EXPORT_SYMBOL(ptlrpc_commit_replies); -EXPORT_SYMBOL(ptlrpc_init_svc); -EXPORT_SYMBOL(ptlrpc_stop_all_threads); -EXPORT_SYMBOL(ptlrpc_start_threads); -EXPORT_SYMBOL(ptlrpc_start_thread); -EXPORT_SYMBOL(ptlrpc_unregister_service); -EXPORT_SYMBOL(ptlrpc_service_health_check); -EXPORT_SYMBOL(ptlrpc_hpreq_reorder); - -/* pack_generic.c */ -EXPORT_SYMBOL(lustre_msg_check_version); -EXPORT_SYMBOL(lustre_pack_request); -EXPORT_SYMBOL(lustre_pack_reply); -EXPORT_SYMBOL(lustre_pack_reply_flags); -EXPORT_SYMBOL(lustre_shrink_msg); -EXPORT_SYMBOL(lustre_free_reply_state); -EXPORT_SYMBOL(lustre_msg_size); -EXPORT_SYMBOL(lustre_packed_msg_size); -EXPORT_SYMBOL(ptlrpc_unpack_rep_msg); -EXPORT_SYMBOL(ptlrpc_unpack_req_msg); -EXPORT_SYMBOL(lustre_msg_buf); -EXPORT_SYMBOL(lustre_msg_string); -EXPORT_SYMBOL(ptlrpc_buf_set_swabbed); -EXPORT_SYMBOL(ptlrpc_buf_need_swab); -EXPORT_SYMBOL(lustre_swab_ptlrpc_body); -EXPORT_SYMBOL(lustre_swab_obdo); -EXPORT_SYMBOL(lustre_swab_obd_statfs); -EXPORT_SYMBOL(lustre_swab_obd_ioobj); -EXPORT_SYMBOL(lustre_swab_niobuf_remote); -EXPORT_SYMBOL(lustre_swab_ost_body); -EXPORT_SYMBOL(lustre_swab_ost_last_id); -EXPORT_SYMBOL(lustre_swab_lvb); -EXPORT_SYMBOL(lustre_swab_mdt_body); -EXPORT_SYMBOL(lustre_swab_mdt_ioepoch); -EXPORT_SYMBOL(lustre_swab_obd_quotactl); -EXPORT_SYMBOL(lustre_swab_mdt_remote_perm); -EXPORT_SYMBOL(lustre_swab_mdt_rec_reint); -EXPORT_SYMBOL(lustre_swab_lov_desc); -EXPORT_SYMBOL(lustre_swab_lov_user_md_v1); -EXPORT_SYMBOL(lustre_swab_lov_user_md_v3); -EXPORT_SYMBOL(lustre_swab_lov_user_md_objects); -EXPORT_SYMBOL(lustre_swab_lov_mds_md); -EXPORT_SYMBOL(lustre_swab_ldlm_res_id); -EXPORT_SYMBOL(lustre_swab_ldlm_policy_data); -EXPORT_SYMBOL(lustre_swab_ldlm_intent); -EXPORT_SYMBOL(lustre_swab_ldlm_resource_desc); -EXPORT_SYMBOL(lustre_swab_ldlm_lock_desc); -EXPORT_SYMBOL(lustre_swab_ldlm_request); -EXPORT_SYMBOL(lustre_swab_ldlm_reply); -EXPORT_SYMBOL(dump_ioo); -EXPORT_SYMBOL(dump_rniobuf); -EXPORT_SYMBOL(dump_obdo); -EXPORT_SYMBOL(dump_ost_body); -EXPORT_SYMBOL(dump_rcs); -EXPORT_SYMBOL(lustre_swab_qdata); -EXPORT_SYMBOL(lustre_swab_quota_adjust_qunit); -EXPORT_SYMBOL(lustre_msg_get_flags); -EXPORT_SYMBOL(lustre_msg_add_flags); -EXPORT_SYMBOL(lustre_msg_set_flags); -EXPORT_SYMBOL(lustre_msg_clear_flags); -EXPORT_SYMBOL(lustre_msg_get_op_flags); -EXPORT_SYMBOL(lustre_msg_add_op_flags); -EXPORT_SYMBOL(lustre_msg_set_op_flags); -EXPORT_SYMBOL(lustre_msg_get_handle ); -EXPORT_SYMBOL(lustre_msg_get_type); -EXPORT_SYMBOL(lustre_msg_get_version); -EXPORT_SYMBOL(lustre_msg_add_version); -EXPORT_SYMBOL(lustre_msg_get_opc); -EXPORT_SYMBOL(lustre_msg_get_last_xid); -EXPORT_SYMBOL(lustre_msg_get_last_committed); -EXPORT_SYMBOL(lustre_msg_get_versions); -EXPORT_SYMBOL(lustre_msg_get_transno); -EXPORT_SYMBOL(lustre_msg_get_status); -EXPORT_SYMBOL(lustre_msg_get_slv); -EXPORT_SYMBOL(lustre_msg_get_limit); -EXPORT_SYMBOL(lustre_msg_set_slv); -EXPORT_SYMBOL(lustre_msg_set_limit); -EXPORT_SYMBOL(lustre_msg_get_conn_cnt); -EXPORT_SYMBOL(lustre_msg_is_v1); -EXPORT_SYMBOL(lustre_msg_get_magic); -EXPORT_SYMBOL(lustre_msg_set_handle); -EXPORT_SYMBOL(lustre_msg_set_type); -EXPORT_SYMBOL(lustre_msg_set_opc); -EXPORT_SYMBOL(lustre_msg_set_last_xid); -EXPORT_SYMBOL(lustre_msg_set_last_committed); -EXPORT_SYMBOL(lustre_msg_set_versions); -EXPORT_SYMBOL(lustre_msg_set_transno); -EXPORT_SYMBOL(lustre_msg_set_status); -EXPORT_SYMBOL(lustre_msg_set_conn_cnt); -EXPORT_SYMBOL(lustre_swab_mgs_target_info); -EXPORT_SYMBOL(lustre_swab_generic_32s); -EXPORT_SYMBOL(lustre_swab_lustre_capa); -EXPORT_SYMBOL(lustre_swab_lustre_capa_key); -EXPORT_SYMBOL(lustre_swab_fiemap); - -/* recover.c */ -EXPORT_SYMBOL(ptlrpc_disconnect_import); -EXPORT_SYMBOL(ptlrpc_resend); -EXPORT_SYMBOL(ptlrpc_wake_delayed); -EXPORT_SYMBOL(ptlrpc_set_import_active); -EXPORT_SYMBOL(ptlrpc_activate_import); -EXPORT_SYMBOL(ptlrpc_deactivate_import); -EXPORT_SYMBOL(ptlrpc_invalidate_import); -EXPORT_SYMBOL(ptlrpc_fail_import); -EXPORT_SYMBOL(ptlrpc_recover_import); - -/* pinger.c */ -EXPORT_SYMBOL(ptlrpc_pinger_add_import); -EXPORT_SYMBOL(ptlrpc_pinger_del_import); -EXPORT_SYMBOL(ptlrpc_add_timeout_client); -EXPORT_SYMBOL(ptlrpc_del_timeout_client); -EXPORT_SYMBOL(ptlrpc_pinger_sending_on_import); - -/* ptlrpcd.c */ -EXPORT_SYMBOL(ptlrpcd_addref); -EXPORT_SYMBOL(ptlrpcd_decref); -EXPORT_SYMBOL(ptlrpcd_add_req); -EXPORT_SYMBOL(ptlrpcd_wake); - -/* llogd.c */ -EXPORT_SYMBOL(llog_origin_handle_create); -EXPORT_SYMBOL(llog_origin_handle_destroy); -EXPORT_SYMBOL(llog_origin_handle_next_block); -EXPORT_SYMBOL(llog_origin_handle_prev_block); -EXPORT_SYMBOL(llog_origin_handle_read_header); -EXPORT_SYMBOL(llog_origin_handle_close); -EXPORT_SYMBOL(llog_client_ops); -EXPORT_SYMBOL(llog_catinfo); - MODULE_AUTHOR("Sun Microsystems, Inc. "); MODULE_DESCRIPTION("Lustre Request Processor and Lock Management"); MODULE_LICENSE("GPL");