Skip to contentSkip to conversation

recovered error forward port

PATCH New Mike Anderson 1 participant 1 message Aug 1, 2003 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 recovered error forward port

-andmike
--
Michael Anderson
[email protected]

DESC
Forward port of Kurt Garloff's recovered error fix.
http://marc.theaimsgroup.com/?l=linux-scsi&m=104470522312140&w=2

Also corrected some typos related to setting local scope variable by mistake.

Signature without fix:
Current sdc: sense key Recovered Error Additional sense: Failure prediction threshold exceeded
end_request: I/O error, dev sdc, sector 1808 Buffer I/O error on device sdc, logical block 226

Signature with fix:
scsi_debug: cmd 28 00 00 00 3f 10 00 00 f0 00
scsi_debug: ... <1 0 0 0> non-zero result=0x8000002 Current sdsdc: sense key Recovered Error Additional sense: Failure prediction threshold exceeded

EDESC

 drivers/scsi/sd.c |    6 ++--
 drivers/scsi/sr.c |   79 +++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 56 insertions(+), 29 deletions(-)
drivers/scsi/sd.c renamed from drivers/scsi/sd.c~recovered_error +4 -2
diff -puN drivers/scsi/sd.c~recovered_error drivers/scsi/sd.c
@@ -651,9 +651,11 @@ static void sd_rw_intr(struct scsi_cmnd 
 
 	/* An error occurred */
 	if (driver_byte(result) != 0 && 	/* An error occurred */
-	    SCpnt->sense_buffer[0] == 0xF0) {	/* Sense data is valid */
+	    (SCpnt->sense_buffer[0] & 0x7f) == 0x70) { /* Sense current */
 		switch (SCpnt->sense_buffer[2]) {
 		case MEDIUM_ERROR:
+			if (!(SCpnt->sense_buffer[0] & 0x80))
+				break;
 			error_sector = (SCpnt->sense_buffer[3] << 24) |
 			(SCpnt->sense_buffer[4] << 16) |
 			(SCpnt->sense_buffer[5] << 8) |
@@ -696,7 +698,7 @@ static void sd_rw_intr(struct scsi_cmnd 
 			 * hard error.
 			 */
 			print_sense("sd", SCpnt);
-			result = 0;
+			SCpnt->result = 0;
 			SCpnt->sense_buffer[0] = 0x0;
 			good_sectors = this_count;
 			break;
drivers/scsi/sr.c renamed from drivers/scsi/sr.c~recovered_error +52 -27

91 lines not on this page · raw message

_