Attachment 155002 Details for Bug 228108 – Patch we made against kernel-2.6.18-8.1.4.el5 from kernel-2.6.9-55.EL

[patch] Patch we made against kernel-2.6.18-8.1.4.el5 from kernel-2.6.9-55.EL

tww.patch (text/plain), 1.49 KB, created by The Written Word on 2007-05-18 13:49:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: The Written Word

Created: 2007-05-18 13:49:25 UTC

Size: 1.49 KB

patch

obsolete

>--- drivers/message/fusion/mptscsih.c.orig	2007-05-17 13:46:03.041147046 -0500
>+++ drivers/message/fusion/mptscsih.c	2007-05-17 14:03:36.458221540 -0500
>@@ -770,7 +770,7 @@
> 		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) {
>--- drivers/scsi/scsi_error.c.orig	2007-05-17 14:03:20.513385883 -0500
>+++ drivers/scsi/scsi_error.c	2007-05-17 14:04:26.361427655 -0500
>@@ -1201,6 +1201,15 @@
> 	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_REQUEUE:
> 		return ADD_TO_MLQUEUE;
> 
>--- include/scsi/scsi.h.orig	2007-05-17 14:01:50.125610325 -0500
>+++ include/scsi/scsi.h	2007-05-17 14:02:47.433074642 -0500
>@@ -310,6 +310,8 @@
> #define DID_IMM_RETRY   0x0c	/* Retry without decrementing retry count  */
> #define DID_REQUEUE	0x0d	/* Requeue command (no immediate retry) also
> 				 * without decrementing the 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 228108: 149407 | 149408 | 155002