aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/ulp/iser/iscsi_iser.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/infiniband/ulp/iser/iscsi_iser.c')
-rw-r--r--drivers/infiniband/ulp/iser/iscsi_iser.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 331147b71a91..71237f8f78f7 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -190,7 +190,7 @@ iscsi_iser_mtask_xmit(struct iscsi_conn *conn, struct iscsi_task *task)
190{ 190{
191 int error = 0; 191 int error = 0;
192 192
193 iser_dbg("task deq [cid %d itt 0x%x]\n", conn->id, task->itt); 193 iser_dbg("mtask xmit [cid %d itt 0x%x]\n", conn->id, task->itt);
194 194
195 error = iser_send_control(conn, task); 195 error = iser_send_control(conn, task);
196 196
@@ -200,9 +200,6 @@ iscsi_iser_mtask_xmit(struct iscsi_conn *conn, struct iscsi_task *task)
200 * - if yes, the task is recycled at iscsi_complete_pdu 200 * - if yes, the task is recycled at iscsi_complete_pdu
201 * - if no, the task is recycled at iser_snd_completion 201 * - if no, the task is recycled at iser_snd_completion
202 */ 202 */
203 if (error && error != -ENOBUFS)
204 iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
205
206 return error; 203 return error;
207} 204}
208 205
@@ -254,7 +251,7 @@ iscsi_iser_task_xmit(struct iscsi_task *task)
254 task->imm_count, task->unsol_r2t.data_length); 251 task->imm_count, task->unsol_r2t.data_length);
255 } 252 }
256 253
257 iser_dbg("task deq [cid %d itt 0x%x]\n", 254 iser_dbg("ctask xmit [cid %d itt 0x%x]\n",
258 conn->id, task->itt); 255 conn->id, task->itt);
259 256
260 /* Send the cmd PDU */ 257 /* Send the cmd PDU */
@@ -270,8 +267,6 @@ iscsi_iser_task_xmit(struct iscsi_task *task)
270 error = iscsi_iser_task_xmit_unsol_data(conn, task); 267 error = iscsi_iser_task_xmit_unsol_data(conn, task);
271 268
272 iscsi_iser_task_xmit_exit: 269 iscsi_iser_task_xmit_exit:
273 if (error && error != -ENOBUFS)
274 iscsi_conn_failure(conn, ISCSI_ERR_CONN_FAILED);
275 return error; 270 return error;
276} 271}
277 272
@@ -423,7 +418,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep,
423 struct Scsi_Host *shost; 418 struct Scsi_Host *shost;
424 struct iser_conn *ib_conn; 419 struct iser_conn *ib_conn;
425 420
426 shost = iscsi_host_alloc(&iscsi_iser_sht, 0, 1); 421 shost = iscsi_host_alloc(&iscsi_iser_sht, 0, 0);
427 if (!shost) 422 if (!shost)
428 return NULL; 423 return NULL;
429 shost->transportt = iscsi_iser_scsi_transport; 424 shost->transportt = iscsi_iser_scsi_transport;