LU-7955 gnilnd: Add ability to set bte_get/put_dlvr_mode

[fs/lustre-release.git] / lnet / lnet / module.c

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index 8e1ab43..eee6ff4 100644 (file)
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -39,8 +39,8 @@
 #include <lnet/lib-dlc.h>
 
 static int config_on_load = 0;
-CFS_MODULE_PARM(config_on_load, "i", int, 0444,
-                "configure network at module load");
+module_param(config_on_load, int, 0444);
+MODULE_PARM_DESC(config_on_load, "configure network at module load");
 
 static struct mutex lnet_config_mutex;
 
@@ -50,7 +50,7 @@ lnet_configure(void *arg)
        /* 'arg' only there so I can be passed to cfs_create_thread() */
        int    rc = 0;
 
-       LNET_MUTEX_LOCK(&lnet_config_mutex);
+       mutex_lock(&lnet_config_mutex);
 
        if (!the_lnet.ln_niinit_self) {
                rc = try_module_get(THIS_MODULE);
@@ -68,7 +68,7 @@ lnet_configure(void *arg)
        }
 
 out:
-       LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+       mutex_unlock(&lnet_config_mutex);
        return rc;
 }
 
@@ -77,7 +77,7 @@ lnet_unconfigure (void)
 {
        int   refcount;
 
-       LNET_MUTEX_LOCK(&lnet_config_mutex);
+       mutex_lock(&lnet_config_mutex);
 
        if (the_lnet.ln_niinit_self) {
                the_lnet.ln_niinit_self = 0;
@@ -85,11 +85,11 @@ lnet_unconfigure (void)
                module_put(THIS_MODULE);
        }
 
-       LNET_MUTEX_LOCK(&the_lnet.ln_api_mutex);
+       mutex_lock(&the_lnet.ln_api_mutex);
        refcount = the_lnet.ln_refcount;
-       LNET_MUTEX_UNLOCK(&the_lnet.ln_api_mutex);
+       mutex_unlock(&the_lnet.ln_api_mutex);
 
-       LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+       mutex_unlock(&lnet_config_mutex);
 
        return (refcount == 0) ? 0 : -EBUSY;
 }
@@ -101,21 +101,12 @@ lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr)
          (struct lnet_ioctl_config_data *)hdr;
        int                           rc;
 
-       LNET_MUTEX_LOCK(&lnet_config_mutex);
+       mutex_lock(&lnet_config_mutex);
        if (the_lnet.ln_niinit_self)
-               rc = lnet_dyn_add_ni(LNET_PID_LUSTRE,
-                                    conf->cfg_config_u.cfg_net.net_intf,
-                                    conf->cfg_config_u.cfg_net.
-                                       net_peer_timeout,
-                                    conf->cfg_config_u.cfg_net.
-                                       net_peer_tx_credits,
-                                    conf->cfg_config_u.cfg_net.
-                                       net_peer_rtr_credits,
-                                    conf->cfg_config_u.cfg_net.
-                                       net_max_tx_credits);
+               rc = lnet_dyn_add_ni(LNET_PID_LUSTRE, conf);
        else
                rc = -EINVAL;
-       LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+       mutex_unlock(&lnet_config_mutex);
        return rc;
 }
 
@@ -126,12 +117,12 @@ lnet_dyn_unconfigure(struct libcfs_ioctl_hdr *hdr)
          (struct lnet_ioctl_config_data *) hdr;
        int                           rc;
 
-       LNET_MUTEX_LOCK(&lnet_config_mutex);
+       mutex_lock(&lnet_config_mutex);
        if (the_lnet.ln_niinit_self)
                rc = lnet_dyn_del_ni(conf->cfg_net);
        else
                rc = -EINVAL;
-       LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+       mutex_unlock(&lnet_config_mutex);
 
        return rc;
 }
@@ -173,17 +164,16 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
 
 DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl);
 
-static int
-lnet_module_init(void)
+static int __init lnet_init(void)
 {
        int rc;
        ENTRY;
 
        mutex_init(&lnet_config_mutex);
 
-       rc = lnet_init();
+       rc = lnet_lib_init();
        if (rc != 0) {
-               CERROR("lnet_init: error %d\n", rc);
+               CERROR("lnet_lib_init: error %d\n", rc);
                RETURN(rc);
        }
 
@@ -193,27 +183,26 @@ lnet_module_init(void)
        if (config_on_load) {
                /* Have to schedule a separate thread to avoid deadlocking
                 * in modload */
-               (void) kthread_run(lnet_configure, NULL, "lnet_initd");
+               (void)kthread_run(lnet_configure, NULL, "lnet_initd");
        }
 
        RETURN(0);
 }
 
-static void
-lnet_module_exit(void)
+static void __exit lnet_exit(void)
 {
        int rc;
 
        rc = libcfs_deregister_ioctl(&lnet_ioctl_handler);
        LASSERT(rc == 0);
 
-       lnet_fini();
+       lnet_lib_exit();
 }
 
 MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("LNet v3.1");
-MODULE_VERSION("1.0.0");
+MODULE_DESCRIPTION("Lustre Networking layer");
+MODULE_VERSION(LNET_VERSION);
 MODULE_LICENSE("GPL");
 
-module_init(lnet_module_init);
-module_exit(lnet_module_exit);
+module_init(lnet_init);
+module_exit(lnet_exit);