LU-6142 lnet: change wire protocol typedefs to proper structure

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

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index bc36586..a8eaac5 100644 (file)
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/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) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,8 +35,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 +46,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 +64,7 @@ lnet_configure(void *arg)
        }
 
 out:
-       LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+       mutex_unlock(&lnet_config_mutex);
        return rc;
 }
 
@@ -77,7 +73,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 +81,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,12 +97,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);
        else
                rc = -EINVAL;
-       LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+       mutex_unlock(&lnet_config_mutex);
        return rc;
 }
 
@@ -117,12 +113,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;
 }