landing b_cmobd_merge on HEAD

[fs/lustre-release.git] / lustre / portals / portals / api-init.c

diff --git a/lustre/portals/portals/api-init.c b/lustre/portals/portals/api-init.c
index b811391..9a98714 100644 (file)
--- a/lustre/portals/portals/api-init.c
+++ b/lustre/portals/portals/api-init.c
@@ -23,52 +23,27 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define DEBUG_SUBSYSTEM S_PORTALS
 #include <portals/api-support.h>
 
-int ptl_init;
-unsigned int portal_subsystem_debug = ~0 - (S_PORTALS | S_QSWNAL | S_SOCKNAL |
-                                            S_GMNAL | S_IBNAL);
-unsigned int portal_debug = (D_WARNING | D_DLMTRACE | D_ERROR | D_EMERG | D_HA |
-                             D_RPCTRACE | D_VFSTRACE);
-unsigned int portal_cerror = 1;
-unsigned int portal_printk;
-unsigned int portal_stack;
-
-#ifdef __KERNEL__
-atomic_t portal_kmemory = ATOMIC_INIT(0);
-#endif
-
-int __p30_initialized;
-int __p30_myr_initialized;
-int __p30_ip_initialized;
-ptl_handle_ni_t __myr_ni_handle;
-ptl_handle_ni_t __ip_ni_handle;
-
-int __p30_myr_timeout = 10;
-int __p30_ip_timeout;
-
-int PtlInit(void)
+int PtlInit(int *max_interfaces)
 {
+        if (max_interfaces != NULL)
+                *max_interfaces = NAL_MAX_NR;
 
-        if (ptl_init)
-                return PTL_OK;
-
-        ptl_ni_init();
-        ptl_me_init();
-        ptl_eq_init();
-        ptl_init = 1;
-        __p30_initialized = 1;
+        LASSERT(!strcmp(ptl_err_str[PTL_MAX_ERRNO], "PTL_MAX_ERRNO"));
 
-        return PTL_OK;
+        return ptl_ni_init();
 }
 
 
 void PtlFini(void)
 {
-
-        /* Reverse order of initialization */
-        ptl_eq_fini();
-        ptl_me_fini();
         ptl_ni_fini();
-        ptl_init = 0;
+}
+
+
+void PtlSnprintHandle(char *str, int len, ptl_handle_any_t h)
+{
+        snprintf(str, len, "0x%lx."LPX64, h.nal_idx, h.cookie);
 }