SCSI: Make error printing more verbose

PATCH In review Martin K. Petersen 1 participant 1 message Feb 28, 2007 SCSI

lore

Share & tools

lore

Martin K. Petersen

author

2007-02-28 03:40 UTC #0 lore raw

PATCH 2/4 SCSI: Make error printing more verbose

This patch enhances SCSI error printing by:

- Making use of scsi_print_result() in the completion functions.

- Having scmd_printk() output the disk name (when applicable).

Signed-off-by Martin K. Petersen <[email protected]>

---

 drivers/scsi/scsi.c        |   47 ++++++++++++++++-----------------------------
 drivers/scsi/scsi_lib.c    |    4 ---
 include/scsi/scsi_device.h |    8 +++++--
 3 files changed, 24 insertions(+), 35 deletions(-)

drivers/scsi/scsi_lib.c +1 -3

Index: scsi-misc-2.6/drivers/scsi/scsi_lib.c
===================================================================
@@ -968,9 +968,7 @@ void scsi_io_completion(struct scsi_cmnd
 	}
 	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);
 		}

include/scsi/scsi_device.h +6 -2

Index: scsi-misc-2.6/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;

@@ -153,8 +154,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,

drivers/scsi/scsi.c +17 ~~-30~~

101 lines not on this page · raw message