- debug info to investigate a source of small writes

[fs/lustre-release.git] / lnet / klnds / gmlnd / gmlnd_module.c

diff --git a/lnet/klnds/gmlnd/gmlnd_module.c b/lnet/klnds/gmlnd/gmlnd_module.c
index 31f6819..449c331 100644 (file)
--- a/lnet/klnds/gmlnd/gmlnd_module.c
+++ b/lnet/klnds/gmlnd/gmlnd_module.c
@@ -22,66 +22,8 @@
 #include "gmnal.h"
 
 
-int gmnal_small_msg_size = 525312;
-/*
- *      -1 indicates default value.
- *      This is 1 thread per cpu
- *      See start_kernel_threads
- */
-int num_rx_threads = -1;
-int num_stxds = 5;
-int gm_port = 4;
-
-ptl_handle_ni_t        kgmnal_ni;
-
-
-int 
-gmnal_cmd(struct portals_cfg *pcfg, void *private)
-{
-       gmnal_data_t    *nal_data = NULL;
-       char            *name = NULL;
-       int             nid = -2;
-       int             gnid;
-       gm_status_t     gm_status;
-
-
-       CDEBUG(D_TRACE, "gmnal_cmd [%d] private [%p]\n", 
-              pcfg->pcfg_command, private);
-       nal_data = (gmnal_data_t*)private;
-       switch(pcfg->pcfg_command) {
-       /*
-        * just reuse already defined GET_NID. Should define GMNAL version
-        */
-       case(GMNAL_IOC_GET_GNID):
-
-               PORTAL_ALLOC(name, pcfg->pcfg_plen1);
-               copy_from_user(name, pcfg->pcfg_pbuf1, pcfg->pcfg_plen1);
-       
-               GMNAL_GM_LOCK(nal_data);
-               nid = gm_host_name_to_node_id(nal_data->gm_port, name);
-               GMNAL_GM_UNLOCK(nal_data);
-               CDEBUG(D_INFO, "Local node id is [%d]\n", nid);
-               GMNAL_GM_LOCK(nal_data);
-               gm_status = gm_node_id_to_global_id(nal_data->gm_port, 
-                                                   nid, &gnid);
-               GMNAL_GM_UNLOCK(nal_data);
-               if (gm_status != GM_SUCCESS) {
-                       CDEBUG(D_INFO, "gm_node_id_to_global_id failed[%d]\n", 
-                              gm_status);
-                       return(-1);
-               }
-               CDEBUG(D_INFO, "Global node is is [%u][%x]\n", gnid, gnid);
-               copy_to_user(pcfg->pcfg_pbuf2, &gnid, pcfg->pcfg_plen2);
-       break;
-       default:
-               CDEBUG(D_INFO, "gmnal_cmd UNKNOWN[%d]\n", pcfg->pcfg_command);
-               pcfg->pcfg_nid2 = -1;
-       }
-
-
-       return(0);
-}
-
+int num_txds = 5;
+int gm_port_id = 4;
 
 static int __init
 gmnal_load(void)
@@ -90,30 +32,16 @@ gmnal_load(void)
        CDEBUG(D_TRACE, "This is the gmnal module initialisation routine\n");
 
 
-
-       CDEBUG(D_INFO, "Calling gmnal_init\n");
-       status = PtlNIInit(gmnal_init, 32, 4, 0, &kgmnal_ni);
+       CDEBUG(D_NET, "Calling gmnal_init\n");
+        status = gmnal_init();
        if (status == PTL_OK) {
-               CDEBUG(D_INFO, "Portals GMNAL initialised ok kgmnal_ni\n");
+               CDEBUG(D_NET, "Portals GMNAL initialised ok\n");
        } else {
-               CDEBUG(D_INFO, "Portals GMNAL Failed to initialise\n");
-               return(1);
-               
-       }
-
-       CDEBUG(D_INFO, "Calling kportal_nal_register\n");
-       /*
-        *      global_nal_data is set by gmnal_init
-        */
-       if (kportal_nal_register(GMNAL, &gmnal_cmd, global_nal_data) != 0) {
-               CDEBUG(D_INFO, "kportal_nal_register failed\n");
-               return(1);
+               CDEBUG(D_NET, "Portals GMNAL Failed to initialise\n");
+               return(-ENODEV);
        }
 
-       CDEBUG(D_INFO, "Calling PORTAL_SYMBOL_REGISTER\n");
-       PORTAL_SYMBOL_REGISTER(kgmnal_ni);
-       CDEBUG(D_INFO, "This is the end of the gmnal init routine");
-
+       CDEBUG(D_NET, "This is the end of the gmnal init routine");
 
        return(0);
 }
@@ -122,25 +50,17 @@ gmnal_load(void)
 static void __exit
 gmnal_unload(void)
 {
-
-       kportal_nal_unregister(GMNAL);
-       PORTAL_SYMBOL_UNREGISTER(kgmnal_ni);
        gmnal_fini();
-       global_nal_data = NULL;
        return;
 }
 
 
 module_init(gmnal_load);
-
 module_exit(gmnal_unload);
 
-EXPORT_SYMBOL(kgmnal_ni);
-
-MODULE_PARM(gmnal_small_msg_size, "i");
 MODULE_PARM(num_rx_threads, "i");
-MODULE_PARM(num_stxds, "i");
-MODULE_PARM(gm_port, "i");
+MODULE_PARM(num_txds, "i");
+MODULE_PARM(gm_port_id, "i");
 
 MODULE_AUTHOR("Morgan Doyle");