diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2009-03-05 15:45:57 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-03-13 16:26:51 -0400 |
| commit | 48a237a26db0a31404c83a88e984b37a30ddcf5a (patch) | |
| tree | 37ca02f54e1df67694d0f115b2592ff25955d2af | |
| parent | 091e6dbec966d0727ae7fb2d5a8a2b8ace09a02e (diff) | |
[SCSI] iser: have iser use its own logging
iser has its own logging inrfastrucutre. Convert it to use
it instead of libiscsi.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index 12876392516e..4338f54c41fa 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 */ |
