IB/iser: Remove unnecessary connection checks

Remove unnecessary checks for the IB connection state and for QP
overflow, as conn state changes are reported by iSER to libiscsi and
handled there. QP overflow is theoretically possible only when
unsolicited data-outs are used; anyway it's being checked and handled
by HW drivers.

Signed-off-by: Or Gerlitz <ogerlitz@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 269f23f1b6d16d8df2f093104cab4dc9f37b8df6..036934cdcb92bda7d0336a19156703294cadb90a 100644 (file)
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -357,9 +357,6 @@ int  iser_post_recvl(struct iser_conn *ib_conn);
 int  iser_post_recvm(struct iser_conn *ib_conn, int count);
 int  iser_post_send(struct iser_conn *ib_conn, struct iser_tx_desc *tx_desc);
 
-int iser_conn_state_comp(struct iser_conn *ib_conn,
-                        enum iser_ib_conn_state comp);
-
 int iser_dma_map_task_data(struct iscsi_iser_task *iser_task,
                            struct iser_data_buf       *data,
                            enum   iser_data_dir       iser_dir,

diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index e27eb875765042d2184c06015813bee7cfc8911b..27450eebd1e42965a911aa75a9dd43d92b12d3bb 100644 (file)
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -260,20 +260,6 @@ int iser_conn_set_full_featured_mode(struct iscsi_conn *conn)
        return 0;
 }
 
-static int
-iser_check_xmit(struct iscsi_conn *conn, void *task)
-{
-       struct iscsi_iser_conn *iser_conn = conn->dd_data;
-
-       if (atomic_read(&iser_conn->ib_conn->post_send_buf_count) ==
-           ISER_QP_MAX_REQ_DTOS) {
-               iser_dbg("%ld can't xmit task %p\n",jiffies,task);
-               return -ENOBUFS;
-       }
-       return 0;
-}
-
-
 /**
  * iser_send_command - send command PDU
  */
@@ -289,13 +275,6 @@ int iser_send_command(struct iscsi_conn *conn,
        struct scsi_cmnd *sc  =  task->sc;
        struct iser_tx_desc *tx_desc = &iser_task->desc;
 
-       if (!iser_conn_state_comp(iser_conn->ib_conn, ISER_CONN_UP)) {
-               iser_err("Failed to send, conn: 0x%p is not up\n", iser_conn->ib_conn);
-               return -EPERM;
-       }
-       if (iser_check_xmit(conn, task))
-               return -ENOBUFS;
-
        edtl = ntohl(hdr->data_length);
 
        /* build the tx desc regd header and add it to the tx desc dto */
@@ -357,15 +336,6 @@ int iser_send_data_out(struct iscsi_conn *conn,
        int err = 0;
        struct ib_sge *tx_dsg;
 
-
-       if (!iser_conn_state_comp(iser_conn->ib_conn, ISER_CONN_UP)) {
-               iser_err("Failed to send, conn: 0x%p is not up\n", iser_conn->ib_conn);
-               return -EPERM;
-       }
-
-       if (iser_check_xmit(conn, task))
-               return -ENOBUFS;
-
        itt = (__force uint32_t)hdr->itt;
        data_seg_len = ntoh24(hdr->dlength);
        buf_offset   = ntohl(hdr->offset);
@@ -425,14 +395,6 @@ int iser_send_control(struct iscsi_conn *conn,
        int err = 0;
        struct iser_device *device;
 
-       if (!iser_conn_state_comp(iser_conn->ib_conn, ISER_CONN_UP)) {
-               iser_err("Failed to send, conn: 0x%p is not up\n", iser_conn->ib_conn);
-               return -EPERM;
-       }
-
-       if (iser_check_xmit(conn, task))
-               return -ENOBUFS;
-
        /* build the tx desc regd header and add it to the tx desc dto */
        mdesc->type = ISCSI_TX_CONTROL;
        iser_create_send_desc(iser_conn->ib_conn, mdesc);

diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 18cf65f092e89f050592c28c699710ee15ebb459..308d17bb514641767a109f9e65d2bcea370cee82 100644 (file)
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -300,17 +300,6 @@ static void iser_device_try_release(struct iser_device *device)
        mutex_unlock(&ig.device_list_mutex);
 }
 
-int iser_conn_state_comp(struct iser_conn *ib_conn,
-                       enum iser_ib_conn_state comp)
-{
-       int ret;
-
-       spin_lock_bh(&ib_conn->lock);
-       ret = (ib_conn->state == comp);
-       spin_unlock_bh(&ib_conn->lock);
-       return ret;
-}
-
 static int iser_conn_state_comp_exch(struct iser_conn *ib_conn,
                                     enum iser_ib_conn_state comp,
                                     enum iser_ib_conn_state exch)