X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fklnds%2Fgmlnd%2Fgmlnd_module.c;h=6cd622f6a1efc6f258331e1ec509738b70ca94f3;hb=7e80985d02e71f02b9a99f91d6eb0e154ba56c85;hp=278230e66edd8c14dc5ce602d33d3893a55d98a0;hpb=2dc9c16e770415d56839e1996015fec5fab93f29;p=fs%2Flustre-release.git

diff --git a/lnet/klnds/gmlnd/gmlnd_module.c b/lnet/klnds/gmlnd/gmlnd_module.c
index 278230e..6cd622f 100644
--- a/lnet/klnds/gmlnd/gmlnd_module.c
+++ b/lnet/klnds/gmlnd/gmlnd_module.c
@@ -30,7 +30,7 @@ int gmnal_small_msg_size = 525312;
  */
 int num_rx_threads = -1;
 int num_stxds = 5;
-int gm_port = 4;
+int gm_port_id = 4;
 
 int 
 gmnal_cmd(struct portals_cfg *pcfg, void *private)
@@ -52,12 +52,18 @@ gmnal_cmd(struct portals_cfg *pcfg, void *private)
 	case(GMNAL_IOC_GET_GNID):
 
 		PORTAL_ALLOC(name, pcfg->pcfg_plen1);
-		copy_from_user(name, pcfg->pcfg_pbuf1, pcfg->pcfg_plen1);
+		copy_from_user(name, PCFG_PBUF(pcfg, 1), pcfg->pcfg_plen1);
 	
 		GMNAL_GM_LOCK(nal_data);
-		nid = gm_host_name_to_node_id(nal_data->gm_port, name);
+		//nid = gm_host_name_to_node_id(nal_data->gm_port, name);
+                gm_status = gm_host_name_to_node_id_ex (nal_data->gm_port, 0, name, &nid);
 		GMNAL_GM_UNLOCK(nal_data);
-		CDEBUG(D_INFO, "Local node id is [%d]\n", nid);
+                if (gm_status != GM_SUCCESS) {
+                        CDEBUG(D_INFO, "gm_host_name_to_node_id_ex(...host %s) failed[%d]\n",
+                                name, gm_status);
+                        return (-1);
+                } else
+		        CDEBUG(D_INFO, "Local node %s id is [%d]\n", name, nid);
 		GMNAL_GM_LOCK(nal_data);
 		gm_status = gm_node_id_to_global_id(nal_data->gm_port, 
 						    nid, &gnid);
@@ -68,7 +74,7 @@ gmnal_cmd(struct portals_cfg *pcfg, void *private)
 			return(-1);
 		}
 		CDEBUG(D_INFO, "Global node is is [%u][%x]\n", gnid, gnid);
-		copy_to_user(pcfg->pcfg_pbuf2, &gnid, pcfg->pcfg_plen2);
+		copy_to_user(PCFG_PBUF(pcfg, 2), &gnid, pcfg->pcfg_plen2);
 	break;
 	default:
 		CDEBUG(D_INFO, "gmnal_cmd UNKNOWN[%d]\n", pcfg->pcfg_command);
@@ -87,9 +93,8 @@ gmnal_load(void)
 	CDEBUG(D_TRACE, "This is the gmnal module initialisation routine\n");
 
 
-
 	CDEBUG(D_INFO, "Calling gmnal_init\n");
-        statud = gmnal_init();
+        status = gmnal_init();
 	if (status == PTL_OK) {
 		CDEBUG(D_INFO, "Portals GMNAL initialised ok\n");
 	} else {
@@ -120,7 +125,7 @@ module_exit(gmnal_unload);
 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(gm_port_id, "i");
 
 MODULE_AUTHOR("Morgan Doyle");