LU-4423 lustre: don't declare extern variables in C files.

[fs/lustre-release.git] / lustre / ptlrpc / ptlrpc_module.c

diff --git a/lustre/ptlrpc/ptlrpc_module.c b/lustre/ptlrpc/ptlrpc_module.c
index 8a9250d..cd73db8 100644 (file)
--- a/lustre/ptlrpc/ptlrpc_module.c
+++ b/lustre/ptlrpc/ptlrpc_module.c
@@ -15,11 +15,7 @@
  *
  * 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -36,9 +32,6 @@
 
 #define DEBUG_SUBSYSTEM S_RPC
 
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
 
 #include <obd_support.h>
 #include <obd_class.h>
@@ -47,14 +40,7 @@
 
 #include "ptlrpc_internal.h"
 
-extern spinlock_t ptlrpc_last_xid_lock;
-#if RS_DEBUG
-extern spinlock_t ptlrpc_rs_debug_lock;
-#endif
-extern struct mutex pinger_mutex;
-extern struct mutex ptlrpcd_mutex;
-
-__init int ptlrpc_init(void)
+static __init int ptlrpc_init(void)
 {
        int rc;
 
@@ -112,7 +98,13 @@ __init int ptlrpc_init(void)
        if (rc)
                GOTO(err_sptlrpc, rc);
 
+       rc = nodemap_mod_init();
+       if (rc)
+               GOTO(err_nrs, rc);
+
        RETURN(0);
+err_nrs:
+       ptlrpc_nrs_fini();
 err_sptlrpc:
        sptlrpc_fini();
 err_ldlm:
@@ -134,9 +126,9 @@ err_layout:
        return rc;
 }
 
-#ifdef __KERNEL__
 static void __exit ptlrpc_exit(void)
 {
+       nodemap_mod_exit();
        ptlrpc_nrs_fini();
        sptlrpc_fini();
        ldlm_exit();
@@ -149,9 +141,10 @@ static void __exit ptlrpc_exit(void)
        req_layout_fini();
 }
 
-MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
 MODULE_DESCRIPTION("Lustre Request Processor and Lock Management");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
 MODULE_LICENSE("GPL");
 
-cfs_module(ptlrpc, "1.0.0", ptlrpc_init, ptlrpc_exit);
-#endif
+module_init(ptlrpc_init);
+module_exit(ptlrpc_exit);