From 583f452957519d5cdb7f9055c3bdb9040b90398f Mon Sep 17 00:00:00 2001 From: Israel Rukshin Date: Wed, 17 Aug 2016 07:17:37 +0000 Subject: [PATCH] isert: make sure rdma_disconnect is called only once Signed-off-by: Israel Rukshin git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6934 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/isert-scst/iser_rdma.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c index 9f50728d9..5a1dd721f 100644 --- a/iscsi-scst/kernel/isert-scst/iser_rdma.c +++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c @@ -163,10 +163,16 @@ void isert_post_drain(struct isert_connection *isert_conn) void isert_conn_disconnect(struct isert_connection *isert_conn) { - int err = rdma_disconnect(isert_conn->cm_id); + int err; - if (unlikely(err)) - pr_err("Failed to rdma disconnect, err:%d\n", err); + if (isert_conn->state != ISER_CONN_CLOSING) { + isert_conn->state = ISER_CONN_CLOSING; + + err = rdma_disconnect(isert_conn->cm_id); + + if (unlikely(err)) + pr_err("Failed to rdma disconnect, err:%d\n", err); + } } static int isert_pdu_handle_hello_req(struct isert_cmnd *pdu) @@ -1270,6 +1276,7 @@ static void isert_kref_free(struct kref *kref) isert_free_conn_resources(isert_conn); rdma_destroy_id(isert_conn->cm_id); + isert_conn->cm_id = NULL; dev = isert_get_priv(&isert_conn->iscsi); if (dev)