These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lnet / lnet / module.c

diff --git a/kernel/drivers/staging/lustre/lnet/lnet/module.c b/kernel/drivers/staging/lustre/lnet/lnet/module.c
index 72b7fbc..576201a 100644 (file)
--- a/kernel/drivers/staging/lustre/lnet/lnet/module.c
+++ b/kernel/drivers/staging/lustre/lnet/lnet/module.c
@@ -47,9 +47,9 @@ static int
 lnet_configure(void *arg)
 {
        /* 'arg' only there so I can be passed to cfs_create_thread() */
-       int    rc = 0;
+       int rc = 0;
 
-       LNET_MUTEX_LOCK(&lnet_config_mutex);
+       mutex_lock(&lnet_config_mutex);
 
        if (!the_lnet.ln_niinit_self) {
                rc = LNetNIInit(LUSTRE_SRV_LNET_PID);
@@ -59,34 +59,34 @@ lnet_configure(void *arg)
                }
        }
 
-       LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+       mutex_unlock(&lnet_config_mutex);
        return rc;
 }
 
 static int
 lnet_unconfigure(void)
 {
-       int   refcount;
+       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;
                LNetNIFini();
        }
 
-       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;
 }
 
 static int
 lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_data *data)
 {
-       int   rc;
+       int rc;
 
        switch (cmd) {
        case IOC_LIBCFS_CONFIGURE:
@@ -113,13 +113,13 @@ static DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl);
 static int __init
 init_lnet(void)
 {
-       int               rc;
+       int rc;
 
        mutex_init(&lnet_config_mutex);
 
-       rc = LNetInit();
+       rc = lnet_init();
        if (rc != 0) {
-               CERROR("LNetInit: error %d\n", rc);
+               CERROR("lnet_init: error %d\n", rc);
                return rc;
        }
 
@@ -143,11 +143,11 @@ fini_lnet(void)
        rc = libcfs_deregister_ioctl(&lnet_ioctl_handler);
        LASSERT(rc == 0);
 
-       LNetFini();
+       lnet_fini();
 }
 
 MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
-MODULE_DESCRIPTION("Portals v3.1");
+MODULE_DESCRIPTION("LNet v3.1");
 MODULE_LICENSE("GPL");
 MODULE_VERSION("1.0.0");