Attachment 149734 Details for Bug 231319 – use did imm retry instead of did bus busy

[patch] use did imm retry instead of did bus busy

use-did-imm-retry.patch (text/plain), 2.50 KB, created by Mike Christie on 2007-03-09 21:04:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Christie

Created: 2007-03-09 21:04:08 UTC

Size: 2.50 KB

patch

obsolete

>
>diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
>index c05e30b..5c1c597 100644
>--- a/drivers/scsi/qla2xxx/qla_def.h
>+++ b/drivers/scsi/qla2xxx/qla_def.h
>@@ -2708,6 +2708,10 @@ struct _qla2x00stats  {
> 
> #define INVALID_HANDLE	(MAX_OUTSTANDING_COMMANDS+1)
> 
>+#ifndef DID_IMM_RETRY
>+#define DID_IMM_RETRY	DID_BUS_BUSY
>+#endif
>+
> /*
>  * Flash support definitions
>  */
>diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
>index dafa0c6..82b2f10 100644
>--- a/drivers/scsi/qla2xxx/qla_init.c
>+++ b/drivers/scsi/qla2xxx/qla_init.c
>@@ -3583,7 +3583,7 @@ qla2x00_restart_queues(scsi_qla_host_t *ha, uint8_t flush)
> 			 * When time expire return request back to OS as BUSY 
> 			 */
> 			__del_from_pending_queue(ha, sp);
>-			sp->cmd->result = DID_BUS_BUSY << 16;
>+			sp->cmd->result = DID_IMM_RETRY << 16;
> 			sp->cmd->host_scribble = (unsigned char *)NULL;
> 			__add_to_done_queue(ha, sp);
> 		}
>@@ -3603,7 +3603,7 @@ qla2x00_restart_queues(scsi_qla_host_t *ha, uint8_t flush)
> 			sp = list_entry(list, srb_t, list);
> 			/* when time expire return request back to OS as BUSY */
> 			__del_from_retry_queue(ha, sp);
>-			sp->cmd->result = DID_BUS_BUSY << 16;
>+			sp->cmd->result = DID_IMM_RETRY << 16;
> 			sp->cmd->host_scribble = (unsigned char *)NULL;
> 			__add_to_done_queue(ha, sp);
> 		}
>diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
>index e1dc42a..8e1535f 100644
>--- a/drivers/scsi/qla2xxx/qla_os.c
>+++ b/drivers/scsi/qla2xxx/qla_os.c
>@@ -3558,7 +3558,7 @@ __qla2x00_do_dpc(scsi_qla_host_t *ha)
> 				    FCS_DEVICE_LOST) {
> 
> 					__del_from_retry_queue(ha, sp);
>-					sp->cmd->result = DID_BUS_BUSY << 16;
>+					sp->cmd->result = DID_IMM_RETRY << 16;
> 					sp->cmd->host_scribble =
> 					    (unsigned char *) NULL;
> 					__add_to_done_queue(ha, sp);
>@@ -3866,7 +3866,7 @@ qla2x00_abort_queues(scsi_qla_host_t *ha, uint8_t doneqflg)
> 		__del_from_pending_queue(ha, sp);
> 
> 		/* Set ending status. */
>-		sp->cmd->result = DID_BUS_BUSY << 16;
>+		sp->cmd->result = DID_IMM_RETRY << 16;
> 
> 		__add_to_done_queue(ha, sp);
> 	}
>@@ -4218,7 +4218,7 @@ qla2x00_cmd_timeout(srb_t *sp)
> 			else
> 				sp->err_id = SRB_ERR_PORT;
> 		} else {
>-			cmd->result = DID_BUS_BUSY << 16;
>+			cmd->result = DID_IMM_RETRY << 16;
> 		}
> 		__add_to_done_queue(vis_ha, sp);
> 		processed++;
>@@ -4260,7 +4260,7 @@ qla2x00_cmd_timeout(srb_t *sp)
> 			else
> 				sp->err_id = SRB_ERR_PORT;
> 		} else {
>-			cmd->result = DID_BUS_BUSY << 16;
>+			cmd->result = DID_IMM_RETRY << 16;
> 		}
> 
> 		__add_to_done_queue(dest_ha, sp);
>

Actions: View | Diff

Attachments on bug 231319: 149474 | 149734