aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorOr Gerlitz <ogerlitz@voltaire.com>2006-05-02 20:46:43 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-05-10 11:12:52 -0400
commitbe2df72e7ec5fa5e6e1ccccab6cef97ecbb9c191 (patch)
treef4a78a36be0fac5304960e615ad46cc127cf6306 /drivers/scsi
parented2abc7ff19dc99c6242a70f8578a17b2ff0d0ce (diff)
[SCSI] iscsi: align printks
align printk output Signed-off-by: Or Gerlitz <ogerlitz@voltaire.com> Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/iscsi_tcp.c3
-rw-r--r--drivers/scsi/libiscsi.c29
-rw-r--r--drivers/scsi/scsi_transport_iscsi.c4
3 files changed, 19 insertions, 17 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index ac507daacfeb..41f4bb557ea6 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -2585,7 +2585,8 @@ static int __init
2585iscsi_tcp_init(void) 2585iscsi_tcp_init(void)
2586{ 2586{
2587 if (iscsi_max_lun < 1) { 2587 if (iscsi_max_lun < 1) {
2588 printk(KERN_ERR "Invalid max_lun value of %u\n", iscsi_max_lun); 2588 printk(KERN_ERR "iscsi_tcp: Invalid max_lun value of %u\n",
2589 iscsi_max_lun);
2589 return -EINVAL; 2590 return -EINVAL;
2590 } 2591 }
2591 iscsi_tcp_transport.max_lun = iscsi_max_lun; 2592 iscsi_tcp_transport.max_lun = iscsi_max_lun;
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 8c51f6c36661..a99f2ef44e87 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -235,8 +235,8 @@ static int iscsi_scsi_cmd_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
235 235
236 if (datalen < 2) { 236 if (datalen < 2) {
237invalid_datalen: 237invalid_datalen:
238 printk(KERN_ERR "Got CHECK_CONDITION but invalid " 238 printk(KERN_ERR "iscsi: Got CHECK_CONDITION but "
239 "data buffer size of %d\n", datalen); 239 "invalid data buffer size of %d\n", datalen);
240 sc->result = DID_BAD_TARGET << 16; 240 sc->result = DID_BAD_TARGET << 16;
241 goto out; 241 goto out;
242 } 242 }
@@ -441,7 +441,7 @@ int iscsi_verify_itt(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
441 if (hdr->itt != cpu_to_be32(ISCSI_RESERVED_TAG)) { 441 if (hdr->itt != cpu_to_be32(ISCSI_RESERVED_TAG)) {
442 if ((hdr->itt & ISCSI_AGE_MASK) != 442 if ((hdr->itt & ISCSI_AGE_MASK) !=
443 (session->age << ISCSI_AGE_SHIFT)) { 443 (session->age << ISCSI_AGE_SHIFT)) {
444 printk(KERN_ERR "iscsi_tcp: received itt %x expected " 444 printk(KERN_ERR "iscsi: received itt %x expected "
445 "session age (%x)\n", hdr->itt, 445 "session age (%x)\n", hdr->itt,
446 session->age & ISCSI_AGE_MASK); 446 session->age & ISCSI_AGE_MASK);
447 return ISCSI_ERR_BAD_ITT; 447 return ISCSI_ERR_BAD_ITT;
@@ -449,7 +449,7 @@ int iscsi_verify_itt(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
449 449
450 if ((hdr->itt & ISCSI_CID_MASK) != 450 if ((hdr->itt & ISCSI_CID_MASK) !=
451 (conn->id << ISCSI_CID_SHIFT)) { 451 (conn->id << ISCSI_CID_SHIFT)) {
452 printk(KERN_ERR "iscsi_tcp: received itt %x, expected " 452 printk(KERN_ERR "iscsi: received itt %x, expected "
453 "CID (%x)\n", hdr->itt, conn->id); 453 "CID (%x)\n", hdr->itt, conn->id);
454 return ISCSI_ERR_BAD_ITT; 454 return ISCSI_ERR_BAD_ITT;
455 } 455 }
@@ -461,14 +461,14 @@ int iscsi_verify_itt(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
461 ctask = session->cmds[itt]; 461 ctask = session->cmds[itt];
462 462
463 if (!ctask->sc) { 463 if (!ctask->sc) {
464 printk(KERN_INFO "iscsi_tcp: dropping ctask with " 464 printk(KERN_INFO "iscsi: dropping ctask with "
465 "itt 0x%x\n", ctask->itt); 465 "itt 0x%x\n", ctask->itt);
466 /* force drop */ 466 /* force drop */
467 return ISCSI_ERR_NO_SCSI_CMD; 467 return ISCSI_ERR_NO_SCSI_CMD;
468 } 468 }
469 469
470 if (ctask->sc->SCp.phase != session->age) { 470 if (ctask->sc->SCp.phase != session->age) {
471 printk(KERN_ERR "iscsi_tcp: ctask's session age %d, " 471 printk(KERN_ERR "iscsi: ctask's session age %d, "
472 "expected %d\n", ctask->sc->SCp.phase, 472 "expected %d\n", ctask->sc->SCp.phase,
473 session->age); 473 session->age);
474 return ISCSI_ERR_SESSION_FAILED; 474 return ISCSI_ERR_SESSION_FAILED;
@@ -686,7 +686,7 @@ reject:
686 686
687fault: 687fault:
688 spin_unlock(&session->lock); 688 spin_unlock(&session->lock);
689 printk(KERN_ERR "iscsi_tcp: cmd 0x%x is not queued (%d)\n", 689 printk(KERN_ERR "iscsi: cmd 0x%x is not queued (%d)\n",
690 sc->cmnd[0], reason); 690 sc->cmnd[0], reason);
691 sc->result = (DID_NO_CONNECT << 16); 691 sc->result = (DID_NO_CONNECT << 16);
692 sc->resid = sc->request_bufflen; 692 sc->resid = sc->request_bufflen;
@@ -857,7 +857,7 @@ failed:
857 857
858 spin_lock_bh(&session->lock); 858 spin_lock_bh(&session->lock);
859 if (session->state == ISCSI_STATE_LOGGED_IN) 859 if (session->state == ISCSI_STATE_LOGGED_IN)
860 printk(KERN_INFO "host reset succeeded\n"); 860 printk(KERN_INFO "iscsi: host reset succeeded\n");
861 else 861 else
862 goto failed; 862 goto failed;
863 spin_unlock_bh(&session->lock); 863 spin_unlock_bh(&session->lock);
@@ -1042,8 +1042,8 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
1042 1042
1043 /* what should we do here ? */ 1043 /* what should we do here ? */
1044 if (conn->ctask == ctask) { 1044 if (conn->ctask == ctask) {
1045 printk(KERN_INFO "sc %p itt 0x%x partially sent. Failing " 1045 printk(KERN_INFO "iscsi: sc %p itt 0x%x partially sent. "
1046 "abort\n", sc, ctask->itt); 1046 "Failing abort\n", sc, ctask->itt);
1047 goto failed; 1047 goto failed;
1048 } 1048 }
1049 1049
@@ -1441,8 +1441,9 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
1441 } 1441 }
1442 spin_unlock_irqrestore(session->host->host_lock, flags); 1442 spin_unlock_irqrestore(session->host->host_lock, flags);
1443 msleep_interruptible(500); 1443 msleep_interruptible(500);
1444 printk("conn_destroy(): host_busy %d host_failed %d\n", 1444 printk(KERN_INFO "iscsi: scsi conn_destroy(): host_busy %d "
1445 session->host->host_busy, session->host->host_failed); 1445 "host_failed %d\n", session->host->host_busy,
1446 session->host->host_failed);
1446 /* 1447 /*
1447 * force eh_abort() to unblock 1448 * force eh_abort() to unblock
1448 */ 1449 */
@@ -1662,7 +1663,7 @@ void iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
1662 mutex_unlock(&conn->xmitmutex); 1663 mutex_unlock(&conn->xmitmutex);
1663 break; 1664 break;
1664 default: 1665 default:
1665 printk(KERN_ERR "invalid stop flag %d\n", flag); 1666 printk(KERN_ERR "iscsi: invalid stop flag %d\n", flag);
1666 } 1667 }
1667} 1668}
1668EXPORT_SYMBOL_GPL(iscsi_conn_stop); 1669EXPORT_SYMBOL_GPL(iscsi_conn_stop);
@@ -1679,7 +1680,7 @@ int iscsi_conn_bind(struct iscsi_cls_session *cls_session,
1679 if (tmp == conn) { 1680 if (tmp == conn) {
1680 if (conn->c_stage != ISCSI_CONN_STOPPED || 1681 if (conn->c_stage != ISCSI_CONN_STOPPED ||
1681 conn->stop_stage == STOP_CONN_TERM) { 1682 conn->stop_stage == STOP_CONN_TERM) {
1682 printk(KERN_ERR "iscsi_tcp: can't bind " 1683 printk(KERN_ERR "iscsi: can't bind "
1683 "non-stopped connection (%d:%d)\n", 1684 "non-stopped connection (%d:%d)\n",
1684 conn->c_stage, conn->stop_stage); 1685 conn->c_stage, conn->stop_stage);
1685 spin_unlock_bh(&session->lock); 1686 spin_unlock_bh(&session->lock);
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 7b7a194822da..1b96f7c4ce7a 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -266,8 +266,8 @@ static void session_recovery_timedout(void *data)
266{ 266{
267 struct iscsi_cls_session *session = data; 267 struct iscsi_cls_session *session = data;
268 268
269 dev_printk(KERN_INFO, &session->dev, "session recovery timed out " 269 dev_printk(KERN_INFO, &session->dev, "iscsi: session recovery timed "
270 "after %d secs\n", session->recovery_tmo); 270 "out after %d secs\n", session->recovery_tmo);
271 271
272 if (session->transport->session_recovery_timedout) 272 if (session->transport->session_recovery_timedout)
273 session->transport->session_recovery_timedout(session); 273 session->transport->session_recovery_timedout(session);