Merge r5865 from the iser branch

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6264 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-06-11 16:29:39 +00:00
parent bd520b5e23
commit a9b0644c96
2 changed files with 0 additions and 3 deletions
-1
View File
@@ -199,7 +199,6 @@ struct isert_connection {
size_t peer_addrsz;
struct sockaddr_storage self_addr;
struct list_head dev_node;
struct list_head portal_node;
unsigned long flags;
-2
View File
@@ -1166,7 +1166,6 @@ static void isert_kref_free(struct kref *kref)
mutex_lock(&dev_list_mutex);
isert_dev->cq_qps[cq->idx]--;
list_del(&isert_conn->portal_node);
list_del(&isert_conn->dev_node);
isert_deref_device(isert_dev);
if (unlikely(isert_conn->portal->state == ISERT_PORTAL_INACTIVE))
isert_portal_free(isert_conn->portal);
@@ -1263,7 +1262,6 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id,
mutex_lock(&dev_list_mutex);
list_add_tail(&isert_conn->portal_node, &portal->conn_list);
list_add_tail(&isert_conn->dev_node, &isert_dev->conn_list);
mutex_unlock(&dev_list_mutex);
/* initiator is dst, target is src */