X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fptlrpc_module.c;h=16c47c44697c520c36f1fdf4ea6fe404cff9d15e;hb=23628cd3fedf3f62b265245c4a9853da0330eff0;hp=c7d7093c28640394f8c1e731d8ff38b0b93b1c6f;hpb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/ptlrpc_module.c b/lustre/ptlrpc/ptlrpc_module.c index c7d7093..16c47c4 100644 --- a/lustre/ptlrpc/ptlrpc_module.c +++ b/lustre/ptlrpc/ptlrpc_module.c @@ -1,26 +1,37 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (c) 2002, 2003 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #ifndef EXPORT_SYMTAB @@ -44,8 +55,6 @@ extern spinlock_t ptlrpc_rs_debug_lock; extern spinlock_t ptlrpc_all_services_lock; extern struct semaphore pinger_sem; extern struct semaphore ptlrpcd_sem; -extern int ptlrpc_init_portals(void); -extern void ptlrpc_exit_portals(void); __init int ptlrpc_init(void) { @@ -53,11 +62,11 @@ __init int ptlrpc_init(void) ENTRY; lustre_assert_wire_constants(); - spin_lock_init(&ptlrpc_last_xid_lock); spin_lock_init(&ptlrpc_rs_debug_lock); spin_lock_init(&ptlrpc_all_services_lock); init_mutex(&pinger_sem); init_mutex(&ptlrpcd_sem); + ptlrpc_init_xid(); rc = req_layout_init(); if (rc) @@ -69,13 +78,12 @@ __init int ptlrpc_init(void) RETURN(rc); cleanup_phase = 2; - ptlrpc_init_connection(); - rc = llog_init_commit_master(); + rc = ptlrpc_connection_init(); if (rc) GOTO(cleanup, rc); cleanup_phase = 3; - ptlrpc_put_connection_superhack = ptlrpc_put_connection; + ptlrpc_put_connection_superhack = ptlrpc_connection_put; rc = ptlrpc_start_pinger(); if (rc) @@ -91,17 +99,23 @@ __init int ptlrpc_init(void) if (rc) GOTO(cleanup, rc); + cleanup_phase = 6; + rc = llog_recov_init(); + if (rc) + GOTO(cleanup, rc); + RETURN(0); cleanup: switch(cleanup_phase) { + case 6: + sptlrpc_fini(); case 5: ldlm_exit(); case 4: ptlrpc_stop_pinger(); case 3: - llog_cleanup_commit_master(1); - ptlrpc_cleanup_connection(); + ptlrpc_connection_fini(); case 2: ptlrpc_exit_portals(); case 1: @@ -115,22 +129,20 @@ cleanup: #ifdef __KERNEL__ static void __exit ptlrpc_exit(void) { + llog_recov_fini(); sptlrpc_fini(); ldlm_exit(); ptlrpc_stop_pinger(); ptlrpc_exit_portals(); - ptlrpc_cleanup_connection(); - llog_cleanup_commit_master(0); + ptlrpc_connection_fini(); } /* connection.c */ -EXPORT_SYMBOL(ptlrpc_dump_connections); -EXPORT_SYMBOL(ptlrpc_readdress_connection); -EXPORT_SYMBOL(ptlrpc_get_connection); -EXPORT_SYMBOL(ptlrpc_put_connection); +EXPORT_SYMBOL(ptlrpc_connection_get); +EXPORT_SYMBOL(ptlrpc_connection_put); EXPORT_SYMBOL(ptlrpc_connection_addref); -EXPORT_SYMBOL(ptlrpc_init_connection); -EXPORT_SYMBOL(ptlrpc_cleanup_connection); +EXPORT_SYMBOL(ptlrpc_connection_init); +EXPORT_SYMBOL(ptlrpc_connection_fini); /* niobuf.c */ EXPORT_SYMBOL(ptlrpc_start_bulk_transfer); @@ -139,6 +151,7 @@ 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); @@ -154,8 +167,13 @@ 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_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_free_req); EXPORT_SYMBOL(ptlrpc_unregister_reply); EXPORT_SYMBOL(ptlrpc_req_finished); EXPORT_SYMBOL(ptlrpc_req_finished_with_imp_lock); @@ -167,8 +185,11 @@ EXPORT_SYMBOL(ptlrpc_prep_bulk_page); EXPORT_SYMBOL(ptlrpc_abort_inflight); 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); @@ -192,13 +213,14 @@ EXPORT_SYMBOL(ptlrpc_daemonize); EXPORT_SYMBOL(ptlrpc_service_health_check); /* pack_generic.c */ -EXPORT_SYMBOL(lustre_msg_swabbed); 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(lustre_unpack_msg); EXPORT_SYMBOL(lustre_msg_buf); EXPORT_SYMBOL(lustre_msg_string); @@ -221,20 +243,16 @@ EXPORT_SYMBOL(lustre_swab_obd_quotactl); EXPORT_SYMBOL(lustre_swab_mds_remote_perm); EXPORT_SYMBOL(lustre_swab_mdt_remote_perm); EXPORT_SYMBOL(lustre_swab_mds_rec_setattr); -EXPORT_SYMBOL(lustre_swab_mdt_rec_setattr); EXPORT_SYMBOL(lustre_swab_mds_rec_create); -EXPORT_SYMBOL(lustre_swab_mdt_rec_create); EXPORT_SYMBOL(lustre_swab_mds_rec_join); EXPORT_SYMBOL(lustre_swab_mdt_rec_join); EXPORT_SYMBOL(lustre_swab_mds_rec_link); -EXPORT_SYMBOL(lustre_swab_mdt_rec_link); EXPORT_SYMBOL(lustre_swab_mds_rec_unlink); -EXPORT_SYMBOL(lustre_swab_mdt_rec_unlink); EXPORT_SYMBOL(lustre_swab_mds_rec_rename); -EXPORT_SYMBOL(lustre_swab_mdt_rec_rename); +EXPORT_SYMBOL(lustre_swab_mdt_rec_reint); EXPORT_SYMBOL(lustre_swab_lov_desc); -EXPORT_SYMBOL(lustre_swab_lov_user_md); -EXPORT_SYMBOL(lustre_swab_lov_mds_md); +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_user_md_join); EXPORT_SYMBOL(lustre_swab_ldlm_res_id); @@ -262,7 +280,12 @@ EXPORT_SYMBOL(lustre_msg_get_last_xid); EXPORT_SYMBOL(lustre_msg_get_last_committed); 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); @@ -277,6 +300,7 @@ EXPORT_SYMBOL(lustre_swab_md_fld); 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); @@ -310,7 +334,7 @@ EXPORT_SYMBOL(llog_origin_handle_close); EXPORT_SYMBOL(llog_client_ops); EXPORT_SYMBOL(llog_catinfo); -MODULE_AUTHOR("Cluster File Systems, Inc. "); +MODULE_AUTHOR("Sun Microsystems, Inc. "); MODULE_DESCRIPTION("Lustre Request Processor and Lock Management"); MODULE_LICENSE("GPL");