Remove maybe_retry from scsi_decide_disposition.
Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
Signed-off-by: Mike Anderson <andmike@xxxxxxxxxxxxxxxxxx>
---
drivers/scsi/scsi_error.c | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 5c112e2..ffe5e70 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1295,7 +1295,6 @@ static void scsi_eh_offline_sdevs(struct list_head *work_q,
*/
int scsi_decide_disposition(struct scsi_cmnd *scmd)
{
- int rtn;
/*
* if the device is offline, then we clearly just pass the result back
@@ -1345,7 +1344,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
* and not get stuck in a loop.
*/
case DID_SOFT_ERROR:
- goto maybe_retry;
+ return NEEDS_RETRY;
case DID_IMM_RETRY:
case DID_REQUEUE:
return ADD_TO_MLQUEUE;
@@ -1375,7 +1374,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
case DID_BUS_BUSY:
case DID_PARITY:
- goto maybe_retry;
+ return NEEDS_RETRY;
case DID_TIME_OUT:
/*
* when we scan the bus, we get timeout messages for
@@ -1422,14 +1421,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
case TASK_ABORTED:
return SUCCESS;
case CHECK_CONDITION:
- rtn = scsi_check_sense(scmd);
- if (rtn == NEEDS_RETRY)
- goto maybe_retry;
- /* if rtn == FAILED, we have no sense information;
- * returning FAILED will wake the error handler thread
- * to collect the sense and redo the decide
- * disposition */
- return rtn;
+ return scsi_check_sense(scmd);
case CONDITION_GOOD:
case INTERMEDIATE_GOOD:
case INTERMEDIATE_C_GOOD:
@@ -1448,8 +1440,6 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd)
}
return FAILED;
- maybe_retry:
- return NEEDS_RETRY;
}
/**
--
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
