1 files changed, 10 insertions, 21 deletions

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 7676bcb7105a..ef73a38bcb6b 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -787,14 +787,10 @@ isert_disconnect_work(struct work_struct *work)
                 isert_put_conn(isert_conn);
                 return;
         }
-        if (!isert_conn->logout_posted) {
-                pr_debug("Calling rdma_disconnect for !logout_posted from"
-                         " isert_disconnect_work\n");
-                rdma_disconnect(isert_conn->conn_cm_id);
-                mutex_unlock(&isert_conn->conn_mutex);
-                iscsit_cause_connection_reinstatement(isert_conn->conn, 0);
-                goto wake_up;
-        }
+
+        /* Send DREQ/DREP towards our initiator */
+        rdma_disconnect(isert_conn->conn_cm_id);
+
         mutex_unlock(&isert_conn->conn_mutex);
 
 wake_up:
@@ -1822,11 +1818,8 @@ isert_do_control_comp(struct work_struct *work)
                 break;
         case ISTATE_SEND_LOGOUTRSP:
                 pr_debug("Calling iscsit_logout_post_handler >>>>>>>>>>>>>>\n");
-                /*
-                 * Call atomic_dec(&isert_conn->post_send_buf_count)
-                 * from isert_wait_conn()
-                 */
-                isert_conn->logout_posted = true;
+
+                atomic_dec(&isert_conn->post_send_buf_count);
                 iscsit_logout_post_handler(cmd, cmd->conn);
                 break;
         case ISTATE_SEND_TEXTRSP:
@@ -2032,6 +2025,8 @@ isert_cq_rx_comp_err(struct isert_conn *isert_conn)
         isert_conn->state = ISER_CONN_DOWN;
         mutex_unlock(&isert_conn->conn_mutex);
 
+        iscsit_cause_connection_reinstatement(isert_conn->conn, 0);
+
         complete(&isert_conn->conn_wait_comp_err);
 }
 
@@ -3211,15 +3206,9 @@ static void isert_wait_conn(struct iscsi_conn *conn)
         struct isert_conn *isert_conn = conn->context;
 
         pr_debug("isert_wait_conn: Starting \n");
-        /*
-         * Decrement post_send_buf_count for special case when called
-         * from isert_do_control_comp() -> iscsit_logout_post_handler()
-         */
-        mutex_lock(&isert_conn->conn_mutex);
-        if (isert_conn->logout_posted)
-                atomic_dec(&isert_conn->post_send_buf_count);
 
-        if (isert_conn->conn_cm_id && isert_conn->state != ISER_CONN_DOWN) {
+        mutex_lock(&isert_conn->conn_mutex);
+        if (isert_conn->conn_cm_id) {
                 pr_debug("Calling rdma_disconnect from isert_wait_conn\n");
                 rdma_disconnect(isert_conn->conn_cm_id);
         }