X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Fmodule.c;h=589badef8f0d7eecd52e0aeec4b99098b18e558d;hb=294c39d488fcd95a523466c7726ff1b5a8327890;hp=7b7ffa5f9635edc109e7c9aec12c4ea5291545ba;hpb=adb6cea0b70ac465b2a47635d9dc45d64ab1605b;p=fs%2Flustre-release.git

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index 7b7ffa5..589bade 100644
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,9 +32,6 @@
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_LNET
 #include <lnet/lib-lnet.h>
 
@@ -44,7 +39,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 +47,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 +57,7 @@ lnet_configure (void *arg)
                 }
         }
 
-        LNET_MUTEX_UP(&lnet_config_mutex);
+        LNET_MUTEX_UNLOCK(&lnet_config_mutex);
         return rc;
 }
 
@@ -71,18 +66,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 +114,7 @@ init_lnet(void)
         int                  rc;
         ENTRY;
 
-        cfs_init_mutex(&lnet_config_mutex);
+        cfs_mutex_init(&lnet_config_mutex);
 
         rc = LNetInit();
         if (rc != 0) {
@@ -150,48 +145,6 @@ fini_lnet(void)
         LNetFini();
 }
 
-EXPORT_SYMBOL(lnet_register_lnd);
-EXPORT_SYMBOL(lnet_unregister_lnd);
-
-EXPORT_SYMBOL(LNetMEAttach);
-EXPORT_SYMBOL(LNetMEInsert);
-EXPORT_SYMBOL(LNetMEUnlink);
-EXPORT_SYMBOL(LNetEQAlloc);
-EXPORT_SYMBOL(LNetMDAttach);
-EXPORT_SYMBOL(LNetMDUnlink);
-EXPORT_SYMBOL(LNetNIInit);
-EXPORT_SYMBOL(LNetNIFini);
-EXPORT_SYMBOL(LNetInit);
-EXPORT_SYMBOL(LNetFini);
-EXPORT_SYMBOL(LNetSnprintHandle);
-EXPORT_SYMBOL(LNetPut);
-EXPORT_SYMBOL(LNetGet);
-EXPORT_SYMBOL(LNetEQWait);
-EXPORT_SYMBOL(LNetEQFree);
-EXPORT_SYMBOL(LNetEQGet);
-EXPORT_SYMBOL(LNetGetId);
-EXPORT_SYMBOL(LNetMDBind);
-EXPORT_SYMBOL(LNetDist);
-EXPORT_SYMBOL(LNetSetAsync);
-EXPORT_SYMBOL(LNetCtl);
-EXPORT_SYMBOL(LNetSetLazyPortal);
-EXPORT_SYMBOL(LNetClearLazyPortal);
-EXPORT_SYMBOL(the_lnet);
-EXPORT_SYMBOL(lnet_iov_nob);
-EXPORT_SYMBOL(lnet_extract_iov);
-EXPORT_SYMBOL(lnet_kiov_nob);
-EXPORT_SYMBOL(lnet_extract_kiov);
-EXPORT_SYMBOL(lnet_copy_iov2iov);
-EXPORT_SYMBOL(lnet_copy_iov2kiov);
-EXPORT_SYMBOL(lnet_copy_kiov2iov);
-EXPORT_SYMBOL(lnet_copy_kiov2kiov);
-EXPORT_SYMBOL(lnet_finalize);
-EXPORT_SYMBOL(lnet_parse);
-EXPORT_SYMBOL(lnet_create_reply_msg);
-EXPORT_SYMBOL(lnet_set_reply_msg_len);
-EXPORT_SYMBOL(lnet_msgtyp2str);
-EXPORT_SYMBOL(lnet_net2ni_locked);
-
 MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
 MODULE_DESCRIPTION("Portals v3.1");
 MODULE_LICENSE("GPL");