Attachment 156841 Details for Bug 243959 – [PATCH1/2] GIT: 6c5f8ce1fb7e8925d957f754a9513911399791b9 for EL5

[patch] [PATCH1/2] GIT: 6c5f8ce1fb7e8925d957f754a9513911399791b9 for EL5

linux-2.6.18-scsi-eh_timed_out-host-template.patch (text/plain), 1.91 KB, created by Haruo Tomita on 2007-06-13 02:26:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Haruo Tomita

Created: 2007-06-13 02:26:00 UTC

Size: 1.91 KB

patch

obsolete

>diff -urpN linux-2.6.18-8.1.4.el5.orig/drivers/scsi/scsi_error.c linux-2.6.18-8.1.4.el5/drivers/scsi/scsi_error.c
>--- linux-2.6.18-8.1.4.el5.orig/drivers/scsi/scsi_error.c	2006-09-20 12:42:06.000000000 +0900
>+++ linux-2.6.18-8.1.4.el5/drivers/scsi/scsi_error.c	2007-06-12 14:55:47.000000000 +0900
>@@ -184,10 +184,19 @@ int scsi_delete_timer(struct scsi_cmnd *
>  **/
> void scsi_times_out(struct scsi_cmnd *scmd)
> {
>+	enum scsi_eh_timer_return (* eh_timed_out)(struct scsi_cmnd *);
>+
> 	scsi_log_completion(scmd, TIMEOUT_ERROR);
> 
> 	if (scmd->device->host->transportt->eh_timed_out)
>-		switch (scmd->device->host->transportt->eh_timed_out(scmd)) {
>+		eh_timed_out = scmd->device->host->transportt->eh_timed_out;
>+	else if (scmd->device->host->hostt->eh_timed_out)
>+		eh_timed_out = scmd->device->host->hostt->eh_timed_out;
>+	else
>+		eh_timed_out = NULL;
>+
>+	if (eh_timed_out)
>+		switch (eh_timed_out(scmd)) {
> 		case EH_HANDLED:
> 			__scsi_done(scmd);
> 			return;
>diff -urpN linux-2.6.18-8.1.4.el5.orig/include/scsi/scsi_host.h linux-2.6.18-8.1.4.el5/include/scsi/scsi_host.h
>--- linux-2.6.18-8.1.4.el5.orig/include/scsi/scsi_host.h	2007-06-12 14:50:06.000000000 +0900
>+++ linux-2.6.18-8.1.4.el5/include/scsi/scsi_host.h	2007-06-12 14:55:47.000000000 +0900
>@@ -288,6 +288,19 @@ struct scsi_host_template {
> 	int (*proc_info)(struct Scsi_Host *, char *, char **, off_t, int, int);
> 
> 	/*
>+	 * This is an optional routine that allows the transport to become
>+	 * involved when a scsi io timer fires. The return value tells the
>+	 * timer routine how to finish the io timeout handling:
>+	 * EH_HANDLED:		I fixed the error, please complete the command
>+	 * EH_RESET_TIMER:	I need more time, reset the timer and
>+	 *			begin counting again
>+	 * EH_NOT_HANDLED	Begin normal error recovery
>+	 *
>+	 * Status: OPTIONAL
>+	 */
>+	enum scsi_eh_timer_return (* eh_timed_out)(struct scsi_cmnd *);
>+
>+	/*
> 	 * suspend support
> 	 */
> 	int (*resume)(struct scsi_device *);

Actions: View | Diff

Attachments on bug 243959: 156841 | 156842