Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
land b1_4_bgl on HEAD (20050404_1913)
[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
278230e
..
6cd622f
100644
(file)
--- 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 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)
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);
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);
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);
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);
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);
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);
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_TRACE, "This is the gmnal module initialisation routine\n");
-
CDEBUG(D_INFO, "Calling gmnal_init\n");
CDEBUG(D_INFO, "Calling gmnal_init\n");
- statu
d
= gmnal_init();
+ statu
s
= gmnal_init();
if (status == PTL_OK) {
CDEBUG(D_INFO, "Portals GMNAL initialised ok\n");
} else {
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(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");
MODULE_AUTHOR("Morgan Doyle");