rpms/kernel/FC-4 linux-2.6-ide-scsi-check_condition.patch, NONE, 1.1 kernel-2.6.spec, 1.1444, 1.1445

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2814

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ide-scsi-check_condition.patch 
Log Message:
Fix up ide-scsi check for medium not present. (#160868)



linux-2.6-ide-scsi-check_condition.patch:
 ide-scsi.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-ide-scsi-check_condition.patch ---

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

patch copies rq->errors to a local variable in idescsi_end_request() which is
used later so it doesn't matter that ide_end_drive_cmd() changes rq->errors

--- 1/drivers/scsi/ide-scsi.c.orig	2005-06-16 17:28:00.000000000 -0400
+++ 2/drivers/scsi/ide-scsi.c	2005-06-16 17:34:08.000000000 -0400
@@ -372,6 +372,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))) {
@@ -398,11 +399,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))


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1444
retrieving revision 1.1445
diff -u -r1.1444 -r1.1445
--- kernel-2.6.spec	26 Aug 2005 23:15:39 -0000	1.1444
+++ kernel-2.6.spec	26 Aug 2005 23:22:58 -0000	1.1445
@@ -329,6 +329,7 @@
 Patch1700: linux-2.6.10-revert-module-invalidparam.patch
 Patch1710: linux-2.6.12rc-ac-ide-fixes.patch
 Patch1711: linux-2.6-ide-tune-locking.patch
+Patch1712: linux-2.6-ide-scsi-check_condition.patch
 Patch1720: linux-2.6.9-module_version.patch
 Patch1730: linux-2.6.9-spinlock-debug-panic.patch
 Patch1740: linux-2.6.11-default-elevator.patch
@@ -772,6 +773,7 @@
 # Numerous IDE fixes.
 %patch1710 -p1
 %patch1711 -p1
+%patch1712 -p1
 # Add missing MODULE_VERSION tags to some modules.
 %patch1720 -p1
 # Make spinlock debugging panic instead of continue.
@@ -1290,6 +1292,7 @@
 - Merge patches proposed for 2.6.12.6
 - Fix typo in ALPS driver.
 - Fix 'No sense' error with Transcend USB key. (#162559)
+- Fix up ide-scsi check for medium not present. (#160868)
 
 * Tue Aug 23 2005 Dave Jones <davej at redhat.com> [2.6.12-1.1435_FC4]
 - Work around AMD x86-64 errata 122.