diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-28 16:30:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-28 16:30:43 -0400 |
commit | d54b3538b0bfb31351d02d1669d4a978d2abfc5f (patch) | |
tree | 5ce539ecba525b30bbfb1c46c55487099264947e /drivers/infiniband/ulp | |
parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
parent | af50bb993dfa673cf21ab812efe620d7e0c36319 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (119 commits)
[SCSI] scsi_dh_rdac: Retry for NOT_READY check condition
[SCSI] mpt2sas: make global symbols unique
[SCSI] sd: Make revalidate less chatty
[SCSI] sd: Try READ CAPACITY 16 first for SBC-2 devices
[SCSI] sd: Refactor sd_read_capacity()
[SCSI] mpt2sas v00.100.11.15
[SCSI] mpt2sas: add MPT2SAS_MINOR(221) to miscdevice.h
[SCSI] ch: Add scsi type modalias
[SCSI] 3w-9xxx: add power management support
[SCSI] bsg: add linux/types.h include to bsg.h
[SCSI] cxgb3i: fix function descriptions
[SCSI] libiscsi: fix possbile null ptr session command cleanup
[SCSI] iscsi class: remove host no argument from session creation callout
[SCSI] libiscsi: pass session failure a session struct
[SCSI] iscsi lib: remove qdepth param from iscsi host allocation
[SCSI] iscsi lib: have lib create work queue for transmitting IO
[SCSI] iscsi class: fix lock dep warning on logout
[SCSI] libiscsi: don't cap queue depth in iscsi modules
[SCSI] iscsi_tcp: replace scsi_debug/tcp_debug logging with iscsi conn logging
[SCSI] libiscsi_tcp: replace tcp_debug/scsi_debug logging with session/conn logging
...
Diffstat (limited to 'drivers/infiniband/ulp')
-rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.c | 17 | ||||
-rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.h | 2 | ||||
-rw-r--r-- | drivers/infiniband/ulp/iser/iser_initiator.c | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index 12876392516e..13d7674b293d 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c | |||
@@ -168,7 +168,7 @@ iscsi_iser_mtask_xmit(struct iscsi_conn *conn, struct iscsi_task *task) | |||
168 | { | 168 | { |
169 | int error = 0; | 169 | int error = 0; |
170 | 170 | ||
171 | debug_scsi("task deq [cid %d itt 0x%x]\n", conn->id, task->itt); | 171 | iser_dbg("task deq [cid %d itt 0x%x]\n", conn->id, task->itt); |
172 | 172 | ||
173 | error = iser_send_control(conn, task); | 173 | error = iser_send_control(conn, task); |
174 | 174 | ||
@@ -195,7 +195,7 @@ iscsi_iser_task_xmit_unsol_data(struct iscsi_conn *conn, | |||
195 | /* Send data-out PDUs while there's still unsolicited data to send */ | 195 | /* Send data-out PDUs while there's still unsolicited data to send */ |
196 | while (iscsi_task_has_unsol_data(task)) { | 196 | while (iscsi_task_has_unsol_data(task)) { |
197 | iscsi_prep_data_out_pdu(task, r2t, &hdr); | 197 | iscsi_prep_data_out_pdu(task, r2t, &hdr); |
198 | debug_scsi("Sending data-out: itt 0x%x, data count %d\n", | 198 | iser_dbg("Sending data-out: itt 0x%x, data count %d\n", |
199 | hdr.itt, r2t->data_count); | 199 | hdr.itt, r2t->data_count); |
200 | 200 | ||
201 | /* the buffer description has been passed with the command */ | 201 | /* the buffer description has been passed with the command */ |
@@ -206,7 +206,7 @@ iscsi_iser_task_xmit_unsol_data(struct iscsi_conn *conn, | |||
206 | goto iscsi_iser_task_xmit_unsol_data_exit; | 206 | goto iscsi_iser_task_xmit_unsol_data_exit; |
207 | } | 207 | } |
208 | r2t->sent += r2t->data_count; | 208 | r2t->sent += r2t->data_count; |
209 | debug_scsi("Need to send %d more as data-out PDUs\n", | 209 | iser_dbg("Need to send %d more as data-out PDUs\n", |
210 | r2t->data_length - r2t->sent); | 210 | r2t->data_length - r2t->sent); |
211 | } | 211 | } |
212 | 212 | ||
@@ -227,12 +227,12 @@ iscsi_iser_task_xmit(struct iscsi_task *task) | |||
227 | if (task->sc->sc_data_direction == DMA_TO_DEVICE) { | 227 | if (task->sc->sc_data_direction == DMA_TO_DEVICE) { |
228 | BUG_ON(scsi_bufflen(task->sc) == 0); | 228 | BUG_ON(scsi_bufflen(task->sc) == 0); |
229 | 229 | ||
230 | debug_scsi("cmd [itt %x total %d imm %d unsol_data %d\n", | 230 | iser_dbg("cmd [itt %x total %d imm %d unsol_data %d\n", |
231 | task->itt, scsi_bufflen(task->sc), | 231 | task->itt, scsi_bufflen(task->sc), |
232 | task->imm_count, task->unsol_r2t.data_length); | 232 | task->imm_count, task->unsol_r2t.data_length); |
233 | } | 233 | } |
234 | 234 | ||
235 | debug_scsi("task deq [cid %d itt 0x%x]\n", | 235 | iser_dbg("task deq [cid %d itt 0x%x]\n", |
236 | conn->id, task->itt); | 236 | conn->id, task->itt); |
237 | 237 | ||
238 | /* Send the cmd PDU */ | 238 | /* Send the cmd PDU */ |
@@ -397,14 +397,14 @@ static void iscsi_iser_session_destroy(struct iscsi_cls_session *cls_session) | |||
397 | static struct iscsi_cls_session * | 397 | static struct iscsi_cls_session * |
398 | iscsi_iser_session_create(struct iscsi_endpoint *ep, | 398 | iscsi_iser_session_create(struct iscsi_endpoint *ep, |
399 | uint16_t cmds_max, uint16_t qdepth, | 399 | uint16_t cmds_max, uint16_t qdepth, |
400 | uint32_t initial_cmdsn, uint32_t *hostno) | 400 | uint32_t initial_cmdsn) |
401 | { | 401 | { |
402 | struct iscsi_cls_session *cls_session; | 402 | struct iscsi_cls_session *cls_session; |
403 | struct iscsi_session *session; | 403 | struct iscsi_session *session; |
404 | struct Scsi_Host *shost; | 404 | struct Scsi_Host *shost; |
405 | struct iser_conn *ib_conn; | 405 | struct iser_conn *ib_conn; |
406 | 406 | ||
407 | shost = iscsi_host_alloc(&iscsi_iser_sht, 0, ISCSI_MAX_CMD_PER_LUN); | 407 | shost = iscsi_host_alloc(&iscsi_iser_sht, 0, 1); |
408 | if (!shost) | 408 | if (!shost) |
409 | return NULL; | 409 | return NULL; |
410 | shost->transportt = iscsi_iser_scsi_transport; | 410 | shost->transportt = iscsi_iser_scsi_transport; |
@@ -423,7 +423,6 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep, | |||
423 | if (iscsi_host_add(shost, | 423 | if (iscsi_host_add(shost, |
424 | ep ? ib_conn->device->ib_device->dma_device : NULL)) | 424 | ep ? ib_conn->device->ib_device->dma_device : NULL)) |
425 | goto free_host; | 425 | goto free_host; |
426 | *hostno = shost->host_no; | ||
427 | 426 | ||
428 | /* | 427 | /* |
429 | * we do not support setting can_queue cmd_per_lun from userspace yet | 428 | * we do not support setting can_queue cmd_per_lun from userspace yet |
@@ -596,7 +595,7 @@ static struct scsi_host_template iscsi_iser_sht = { | |||
596 | .change_queue_depth = iscsi_change_queue_depth, | 595 | .change_queue_depth = iscsi_change_queue_depth, |
597 | .sg_tablesize = ISCSI_ISER_SG_TABLESIZE, | 596 | .sg_tablesize = ISCSI_ISER_SG_TABLESIZE, |
598 | .max_sectors = 1024, | 597 | .max_sectors = 1024, |
599 | .cmd_per_lun = ISCSI_MAX_CMD_PER_LUN, | 598 | .cmd_per_lun = ISER_DEF_CMD_PER_LUN, |
600 | .eh_abort_handler = iscsi_eh_abort, | 599 | .eh_abort_handler = iscsi_eh_abort, |
601 | .eh_device_reset_handler= iscsi_eh_device_reset, | 600 | .eh_device_reset_handler= iscsi_eh_device_reset, |
602 | .eh_target_reset_handler= iscsi_eh_target_reset, | 601 | .eh_target_reset_handler= iscsi_eh_target_reset, |
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h index 861119593f2b..9d529cae1f0d 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.h +++ b/drivers/infiniband/ulp/iser/iscsi_iser.h | |||
@@ -93,7 +93,7 @@ | |||
93 | 93 | ||
94 | /* support upto 512KB in one RDMA */ | 94 | /* support upto 512KB in one RDMA */ |
95 | #define ISCSI_ISER_SG_TABLESIZE (0x80000 >> SHIFT_4K) | 95 | #define ISCSI_ISER_SG_TABLESIZE (0x80000 >> SHIFT_4K) |
96 | #define ISCSI_ISER_MAX_LUN 256 | 96 | #define ISER_DEF_CMD_PER_LUN 128 |
97 | 97 | ||
98 | /* QP settings */ | 98 | /* QP settings */ |
99 | /* Maximal bounds on received asynchronous PDUs */ | 99 | /* Maximal bounds on received asynchronous PDUs */ |
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c index e209cb8dd948..9de640200ad3 100644 --- a/drivers/infiniband/ulp/iser/iser_initiator.c +++ b/drivers/infiniband/ulp/iser/iser_initiator.c | |||
@@ -661,7 +661,7 @@ void iser_snd_completion(struct iser_desc *tx_desc) | |||
661 | 661 | ||
662 | if (resume_tx) { | 662 | if (resume_tx) { |
663 | iser_dbg("%ld resuming tx\n",jiffies); | 663 | iser_dbg("%ld resuming tx\n",jiffies); |
664 | scsi_queue_work(conn->session->host, &conn->xmitwork); | 664 | iscsi_conn_queue_work(conn); |
665 | } | 665 | } |
666 | 666 | ||
667 | if (tx_desc->type == ISCSI_TX_CONTROL) { | 667 | if (tx_desc->type == ISCSI_TX_CONTROL) { |