[PATCH] ide-scsi fails to call idescsi_check_condition for things like "Medium not present"

[Willem Riede <wrlk@riede.org>]

This patch started life as a response to fedora specific ide subsystem changes 
that made error handling of my ATAPI tape drive fail; the specifics are in

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=160868

The insertion of the statement rq->errors = err; near the end of 
ide_end_drive_cmd() in drivers/ide/ide-io.c means that rq->errors does not 
contain what it needs to in idescsi_end_request() in drivers/scsi/ide-scsi.c 
anymore. Recent mainline kernels now also have this change.

The patch below makes ide-scsi whole.

Signed-off-by: Willem Riede <wrlk@riede.org>

--- linux-2.6.14/drivers/scsi/ide-scsi.c	2005-10-27 20:02:08.000000000
-0400
+++ linux-2.6.14w/drivers/scsi/ide-scsi.c	2005-10-29 09:22:47.000000000
-0400
@@ -389,6 +389,7 @@
 	int log = test_bit(IDESCSI_LOG_CMD, &scsi->log);
 	struct Scsi_Host *host;
 	u8 *scsi_buf;
+	int errors = rq->errors;
 	unsigned long flags;
 
 	if (!(rq->flags & (REQ_SPECIAL|REQ_SENSE))) {
@@ -415,11 +416,11 @@
 			printk (KERN_WARNING "ide-scsi: %s: timed out for
%lu\n",
 					drive->name, pc->scsi_cmd->serial_number);
 		pc->scsi_cmd->result = DID_TIME_OUT << 16;
-	} else if (rq->errors >= ERROR_MAX) {
+	} else if (errors >= ERROR_MAX) {
 		pc->scsi_cmd->result = DID_ERROR << 16;
 		if (log)
 			printk ("ide-scsi: %s: I/O error for %lu\n",
drive->name, pc->scsi_cmd->serial_number);
-	} else if (rq->errors) {
+	} else if (errors) {
 		if (log)
 			printk ("ide-scsi: %s: check condition for %lu\n",
drive->name, pc->scsi_cmd->serial_number);
 		if (!idescsi_check_condition(drive, rq))


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/