LU-812 compat: clean up mutex lock to use kernel mutex primitive

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

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index 7b7ffa5..4795a99 100644 (file)
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -44,7 +44,7 @@ static int config_on_load = 0;
 CFS_MODULE_PARM(config_on_load, "i", int, 0444,
                 "configure network at module load");
 
-static cfs_semaphore_t lnet_config_mutex;
+static cfs_mutex_t lnet_config_mutex;
 
 int
 lnet_configure (void *arg)
@@ -52,7 +52,7 @@ lnet_configure (void *arg)
         /* 'arg' only there so I can be passed to cfs_create_thread() */
         int    rc = 0;
 
-        LNET_MUTEX_DOWN(&lnet_config_mutex);
+        LNET_MUTEX_LOCK(&lnet_config_mutex);
 
         if (!the_lnet.ln_niinit_self) {
                 rc = LNetNIInit(LUSTRE_SRV_LNET_PID);
@@ -62,7 +62,7 @@ lnet_configure (void *arg)
                 }
         }
 
-        LNET_MUTEX_UP(&lnet_config_mutex);
+        LNET_MUTEX_UNLOCK(&lnet_config_mutex);
         return rc;
 }
 
@@ -71,18 +71,18 @@ lnet_unconfigure (void)
 {
         int   refcount;
         
-        LNET_MUTEX_DOWN(&lnet_config_mutex);
+        LNET_MUTEX_LOCK(&lnet_config_mutex);
 
         if (the_lnet.ln_niinit_self) {
                 the_lnet.ln_niinit_self = 0;
                 LNetNIFini();
         }
 
-        LNET_MUTEX_DOWN(&the_lnet.ln_api_mutex);
+        LNET_MUTEX_LOCK(&the_lnet.ln_api_mutex);
         refcount = the_lnet.ln_refcount;
-        LNET_MUTEX_UP(&the_lnet.ln_api_mutex);
+        LNET_MUTEX_UNLOCK(&the_lnet.ln_api_mutex);
 
-        LNET_MUTEX_UP(&lnet_config_mutex);
+        LNET_MUTEX_UNLOCK(&lnet_config_mutex);
         return (refcount == 0) ? 0 : -EBUSY;
 }
 
@@ -119,7 +119,7 @@ init_lnet(void)
         int                  rc;
         ENTRY;
 
-        cfs_init_mutex(&lnet_config_mutex);
+        cfs_mutex_init(&lnet_config_mutex);
 
         rc = LNetInit();
         if (rc != 0) {