Attachment 146697 Details for Bug 197158 – Patch made against scsi-misc to (1) create new scsi host status DID_COND_REQUEUE and (2) return this status in mptscsih.c iodone handler detects scsi status of SAM_STAT_BUSY.

[patch] Patch made against scsi-misc to (1) create new scsi host status DID_COND_REQUEUE and (2) return this status in mptscsih.c iodone handler detects scsi status of SAM_STAT_BUSY.

rhel-bugzilla-197158.patch (text/plain), 1.64 KB, created by Ed Goggin on 2007-01-26 18:12:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Goggin

Created: 2007-01-26 18:12:30 UTC

Size: 1.64 KB

patch

obsolete

>diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
>index 2c72c36..ef36b85 100644
>--- a/drivers/message/fusion/mptscsih.c
>+++ b/drivers/message/fusion/mptscsih.c
>@@ -769,7 +769,8 @@ 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) {
>diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
>index 2ecb6ff..59eb561 100644
>--- a/drivers/scsi/scsi_error.c
>+++ b/drivers/scsi/scsi_error.c
>@@ -1216,6 +1216,14 @@ 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;
>+		}
> 	case DID_REQUEUE:
> 		return ADD_TO_MLQUEUE;
> 
>diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
>index 5c0e979..0207f81 100644
>--- a/include/scsi/scsi.h
>+++ b/include/scsi/scsi.h
>@@ -309,6 +309,8 @@ struct scsi_lun {
> #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 197158: 133859 | 146697 | 146944