From a9b0644c967e6d10d24a891e8683a7a8fd61e72b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 11 Jun 2015 16:29:39 +0000 Subject: [PATCH] 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 --- iscsi-scst/kernel/isert-scst/iser.h | 1 - iscsi-scst/kernel/isert-scst/iser_rdma.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/iscsi-scst/kernel/isert-scst/iser.h b/iscsi-scst/kernel/isert-scst/iser.h index 564793a3e..c01e6af67 100644 --- a/iscsi-scst/kernel/isert-scst/iser.h +++ b/iscsi-scst/kernel/isert-scst/iser.h @@ -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; diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c index 83f63368b..1596fb56a 100644 --- a/iscsi-scst/kernel/isert-scst/iser_rdma.c +++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c @@ -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 */