int
ktoenal_close_sock(ptl_nid_t nid)
{
- long flags;
+ unsigned long flags;
ksock_conn_t *conn;
LIST_HEAD (death_row);
struct list_head *tmp;
}
int
-ktoenal_cmd(struct portal_ioctl_data * data, void * private)
+ktoenal_cmd(struct portals_cfg *pcfg, void * private)
{
int rc = -EINVAL;
- LASSERT (data != NULL);
+ LASSERT (pcfg != NULL);
- switch(data->ioc_nal_cmd) {
+ switch(pcfg->pcfg_command) {
case NAL_CMD_REGISTER_PEER_FD: {
- rc = ktoenal_add_sock(data->ioc_nid, data->ioc_fd);
+ rc = ktoenal_add_sock(pcfg->pcfg_nid, pcfg->pcfg_fd);
break;
}
case NAL_CMD_CLOSE_CONNECTION: {
- rc = ktoenal_close_sock(data->ioc_nid);
+ rc = ktoenal_close_sock(pcfg->pcfg_nid);
break;
}
case NAL_CMD_REGISTER_MYNID: {
- rc = ktoenal_set_mynid (data->ioc_nid);
+ rc = ktoenal_set_mynid (pcfg->pcfg_nid);
break;
}
}
CDEBUG(D_MALLOC, "after NAL cleanup: kmem %d\n",
atomic_read (&portal_kmemory));
- printk(KERN_INFO "Routing socket NAL unloaded (final mem %d)\n",
+ printk(KERN_INFO "Lustre: Routing socket NAL unloaded (final mem %d)\n",
atomic_read(&portal_kmemory));
}
/* flag everything initialised */
ktoenal_data.ksnd_init = SOCKNAL_INIT_ALL;
- printk(KERN_INFO"Routing TOE NAL loaded (Routing %s, initial mem %d)\n",
+ printk(KERN_INFO "Lustre: Routing TOE NAL loaded (Routing %s, initial mem %d)\n",
kpr_routing(&ktoenal_data.ksnd_router) ? "enabled" : "disabled",
pkmem);