mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-14 09:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

isert: Fix crash on device removal when iscsi-scstd is started with explicit address

Browse Source 
Signed-off-by: Yan Burman <yanb@mellanox.com>

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5864 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Yan Burman
2014-11-16 13:23:43 +00:00
parent 6a258d3629
commit 06fc2591ae
1 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
iscsi-scst/kernel/isert-scst/iser_rdma.c
View File

@@ -1413,6 +1413,31 @@ static int isert_handle_failure(struct isert_connection *conn)
return 0;
}
static int isert_cm_evt_listener_handler(struct rdma_cm_id *cm_id,
struct rdma_cm_event *cm_ev)
{
enum rdma_cm_event_type ev_type;
struct isert_portal *portal;
int err = 0;
ev_type = cm_ev->event;
portal = cm_id->context;
switch (ev_type) {
case RDMA_CM_EVENT_DEVICE_REMOVAL:
portal->cm_id = NULL;
err = -EINVAL;
break;
default:
pr_info("Listener event:%s(%d), ignored\n",
cm_event_type_str(ev_type), ev_type);
break;
}
return err;
}
static int isert_cm_evt_handler(struct rdma_cm_id *cm_id,
struct rdma_cm_event *cm_ev)
{
@@ -1432,6 +1457,11 @@ static int isert_cm_evt_handler(struct rdma_cm_id *cm_id,
cm_event_type_str(ev_type), ev_type, cm_ev->status,
portal, cm_id);
if (portal->cm_id == cm_id) {
err = isert_cm_evt_listener_handler(cm_id, cm_ev);
goto out;
}
switch (ev_type) {
case RDMA_CM_EVENT_CONNECT_REQUEST:
err = isert_cm_conn_req_handler(cm_id, cm_ev);
@@ -1614,7 +1644,10 @@ void isert_portal_release(struct isert_portal *portal)
pr_info("iser portal cm_id:%p releasing\n", portal->cm_id);
rdma_destroy_id(portal->cm_id);
if (portal->cm_id) {
rdma_destroy_id(portal->cm_id);
portal->cm_id = NULL;
}
mutex_lock(&dev_list_mutex);
list_for_each_entry(conn, &portal->conn_list, portal_node)