If an EH command fails there is no need to escalate; we are already
in EH and the escalation will start anyway.
Signed-off-by: Hannes Reinecke <hare@xxxxxxxx>
---
drivers/scsi/scsi_error.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index cf47b81..7df6818 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -870,15 +870,6 @@ static int scsi_try_to_abort_cmd(struct scsi_host_template *hostt,
return hostt->eh_abort_handler(scmd);
}
-static void scsi_abort_eh_cmnd(struct scsi_cmnd *scmd)
-{
- if (scsi_try_to_abort_cmd(scmd->device->host->hostt, scmd) != SUCCESS)
- if (scsi_try_bus_device_reset(scmd) != SUCCESS)
- if (scsi_try_target_reset(scmd) != SUCCESS)
- if (scsi_try_bus_reset(scmd) != SUCCESS)
- scsi_try_host_reset(scmd);
-}
-
/**
* scsi_eh_prep_cmnd - Save a scsi command info as part of error recovery
* @scmd: SCSI command structure to hijack
@@ -1062,10 +1053,8 @@ retry:
rtn = FAILED;
break;
}
- } else if (rtn != FAILED) {
- scsi_abort_eh_cmnd(scmd);
+ } else if (rtn != FAILED)
rtn = FAILED;
- }
scsi_eh_restore_cmnd(scmd, &ses);
--
1.8.5.6
--
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
