[PATCH] lk 2.4.27 error handling, ad infinitum

[Douglas Gilbert <dougg@torque.net>]

[-- Attachment #1: Type: text/plain, Size: 648 bytes --]

dougg wrote:
 > The following scenario has been brought to my attention.
 >
 > While handling a error (e.g. a timeout) the
 > scsi_send_eh_cmnd() function issues a (stalled) queued command.
 > Now that command hits a repeatable failure (e.g. MEDIUM ERROR).
 >
 > In this scaenario it would seem that the "goto retry" forms
 > an infinite loop re-issuing that command on the same (broken)
 > block.
 >
 > Comments?

No comments, so how about this patch. When the eh retries are
exhausted the code drops through to FAILED state. If a command
in foreground (i.e. not sent by the eh handler) exceeds it retries
then SUCCESS is returned??

Doug Gilbert

[-- Attachment #2: scsi_error2427_retry.diff --]
[-- Type: text/x-patch, Size: 425 bytes --]

--- linux/drivers/scsi/scsi_error.c	2004-04-17 19:30:54.000000000 +1000
+++ linux/drivers/scsi/scsi_error.c2427retry	2004-09-02 19:45:07.858674640 +1000
@@ -664,7 +664,9 @@
 			SCpnt->eh_state = SUCCESS;
 			break;
 		case NEEDS_RETRY:
-			goto retry;
+			if ((++SCpnt->retries) < SCpnt->allowed)
+				goto retry;
+			/* fall through to FAILED if retries exceeded */
 		case FAILED:
 		default:
 			SCpnt->eh_state = FAILED;