3 files changed, 24 insertions, 35 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 1c89ee3e69ba..4c1e31334765 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -344,7 +344,6 @@ void scsi_destroy_command_freelist(struct Scsi_Host *shost)
 void scsi_log_send(struct scsi_cmnd *cmd)
 {
         unsigned int level;
-        struct scsi_device *sdev;
 
         /*
          * If ML QUEUE log level is greater than or equal to:
@@ -361,22 +360,17 @@ void scsi_log_send(struct scsi_cmnd *cmd)
                 level = SCSI_LOG_LEVEL(SCSI_LOG_MLQUEUE_SHIFT,
                                        SCSI_LOG_MLQUEUE_BITS);
                 if (level > 1) {
-                        sdev = cmd->device;
-                        sdev_printk(KERN_INFO, sdev, "send ");
+                        scmd_printk(KERN_INFO, cmd, "Send: ");
                         if (level > 2)
                                 printk("0x%p ", cmd);
-                        /*
-                         * spaces to match disposition and cmd->result
-                         * output in scsi_log_completion.
-                         */
-                        printk("                 ");
+                        printk("\n");
                         scsi_print_command(cmd);
                         if (level > 3) {
                                 printk(KERN_INFO "buffer = 0x%p, bufflen = %d,"
                                        " done = 0x%p, queuecommand 0x%p\n",
                                         cmd->request_buffer, cmd->request_bufflen,
                                         cmd->done,
-                                        sdev->host->hostt->queuecommand);
+                                        cmd->device->host->hostt->queuecommand);
 
                         }
                 }
@@ -386,7 +380,6 @@ void scsi_log_send(struct scsi_cmnd *cmd)
 void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
 {
         unsigned int level;
-        struct scsi_device *sdev;
 
         /*
          * If ML COMPLETE log level is greater than or equal to:
@@ -405,8 +398,7 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
                                        SCSI_LOG_MLCOMPLETE_BITS);
                 if (((level > 0) && (cmd->result || disposition != SUCCESS)) ||
                     (level > 1)) {
-                        sdev = cmd->device;
-                        sdev_printk(KERN_INFO, sdev, "done ");
+                        scmd_printk(KERN_INFO, cmd, "Done: ");
                         if (level > 2)
                                 printk("0x%p ", cmd);
                         /*
@@ -415,40 +407,35 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
                          */
                         switch (disposition) {
                         case SUCCESS:
-                                printk("SUCCESS");
+                                printk("SUCCESS\n");
                                 break;
                         case NEEDS_RETRY:
-                                printk("RETRY  ");
+                                printk("RETRY\n");
                                 break;
                         case ADD_TO_MLQUEUE:
-                                printk("MLQUEUE");
+                                printk("MLQUEUE\n");
                                 break;
                         case FAILED:
-                                printk("FAILED ");
+                                printk("FAILED\n");
                                 break;
                         case TIMEOUT_ERROR:
                                 /* 
                                  * If called via scsi_times_out.
                                  */
-                                printk("TIMEOUT");
+                                printk("TIMEOUT\n");
                                 break;
                         default:
-                                printk("UNKNOWN");
+                                printk("UNKNOWN\n");
                         }
-                        printk(" %8x ", cmd->result);
+                        scsi_print_result(cmd);
                         scsi_print_command(cmd);
-                        if (status_byte(cmd->result) & CHECK_CONDITION) {
-                                /*
-                                 * XXX The scsi_print_sense formatting/prefix
-                                 * doesn't match this function.
-                                 */
+                        if (status_byte(cmd->result) & CHECK_CONDITION)
                                 scsi_print_sense("", cmd);
-                        }
-                        if (level > 3) {
-                                printk(KERN_INFO "scsi host busy %d failed %d\n",
-                                       sdev->host->host_busy,
-                                       sdev->host->host_failed);
-                        }
+                        if (level > 3)
+                                scmd_printk(KERN_INFO, cmd,
+                                            "scsi host busy %d failed %d\n",
+                                            cmd->device->host->host_busy,
+                                            cmd->device->host->host_failed);
                 }
         }
 }
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 9f7482d0b594..5f955707d902 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -968,9 +968,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
         }
         if (result) {
                 if (!(req->cmd_flags & REQ_QUIET)) {
-                        scmd_printk(KERN_INFO, cmd,
-                                    "SCSI error: return code = 0x%08x\n",
-                                    result);
+                        scsi_print_result(cmd);
                         if (driver_byte(result) & DRIVER_SENSE)
                                 scsi_print_sense("", cmd);
                 }
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 9dd37e2f5a84..c86e6ce143df 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -5,6 +5,7 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
+#include <linux/blkdev.h>
 #include <asm/atomic.h>
 
 struct request_queue;
@@ -154,8 +155,11 @@ struct scsi_device {
 #define sdev_printk(prefix, sdev, fmt, a...)    \
         dev_printk(prefix, &(sdev)->sdev_gendev, fmt, ##a)
 
-#define scmd_printk(prefix, scmd, fmt, a...)    \
-        dev_printk(prefix, &(scmd)->device->sdev_gendev, fmt, ##a)
+#define scmd_printk(prefix, scmd, fmt, a...)                            \
+        (scmd)->request->rq_disk ?                                      \
+        sdev_printk(prefix, (scmd)->device, "[%s] " fmt,                \
+                    (scmd)->request->rq_disk->disk_name, ##a) :         \
+        sdev_printk(prefix, (scmd)->device, fmt, ##a)
 
 enum scsi_target_state {
         STARGET_RUNNING = 1,