Attachment 146944 Details for Bug 197158 – touchup of the previous patch to apply to the RHEL-4 kernel.

[patch] touchup of the previous patch to apply to the RHEL-4 kernel.

rhel-bugzilla-197158.patch (text/plain), 1.76 KB, created by Chip Coldwell on 2007-01-30 18:33:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chip Coldwell

Created: 2007-01-30 18:33:34 UTC

Size: 1.76 KB

patch

obsolete

>--- linux-2.6.9/drivers/message/fusion/mptscsi.c.orig	2007-01-25 16:04:01.000000000 -0500
>+++ linux-2.6.9/drivers/message/fusion/mptscsi.c	2007-01-30 13:05:51.000000000 -0500
>@@ -809,7 +809,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_F
> 		case MPI_IOCSTATUS_SCSI_RECOVERED_ERROR:	/* 0x0040 */
> 		case MPI_IOCSTATUS_SUCCESS:			/* 0x0000 */
> 			if (scsi_status == MPI_SCSI_STATUS_BUSY)
>-				sc->result = (DID_BUS_BUSY << 16) | scsi_status;
>+				sc->result = (DID_COND_REQUEUE << 16) | scsi_status;
> 			else
> 				sc->result = (DID_OK << 16) | scsi_status;
> 			if (scsi_state == 0) {
>--- linux-2.6.9/drivers/scsi/scsi_error.c.orig	2007-01-29 15:34:04.000000000 -0500
>+++ linux-2.6.9/drivers/scsi/scsi_error.c	2007-01-30 13:17:41.000000000 -0500
>@@ -1311,6 +1311,15 @@ int scsi_decide_disposition(struct scsi_
> 	case DID_IMM_RETRY:
> 		return NEEDS_RETRY;
> 
>+	case DID_COND_REQUEUE:
>+		/*
>+		 * Return immediately w/o requeue if the request 
>+		 * indicates no retry.
>+		 */
>+		if (blk_noretry_request(scmd->request))
>+			return SUCCESS;
>+		return ADD_TO_MLQUEUE;
>+
> 	case DID_ERROR:
> 		if (msg_byte(scmd->result) == COMMAND_COMPLETE &&
> 		    status_byte(scmd->result) == RESERVATION_CONFLICT)
>--- linux-2.6.9/include/scsi/scsi.h.orig	2007-01-29 15:35:18.000000000 -0500
>+++ linux-2.6.9/include/scsi/scsi.h	2007-01-29 15:36:07.000000000 -0500
>@@ -291,6 +291,8 @@ struct scsi_lun {
> #define DID_PASSTHROUGH 0x0a	/* Force command past mid-layer            */
> #define DID_SOFT_ERROR  0x0b	/* The low level driver just wish a retry  */
> #define DID_IMM_RETRY   0x0c	/* Retry without decrementing retry count  */
>+#define DID_COND_REQUEUE 0x0e   /* Requeue cmd w/o decr of retry count IFF
>+				 * not blk_noretry_request		   */
> #define DRIVER_OK       0x00	/* Driver status                           */
> 
> /*

Actions: View | Diff

Attachments on bug 197158: 133859 | 146697 | 146944