[SCSI] zfcp: Fail erp after timeout

After a timeout notification, do not try to run the erp strategy.
Return from the erp with "failed" to possibly trigger a retry.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 03cd6365ed047e3fcaa0861bad80db84ca6aca8f..64471ba6ac09ffa5a6faa75bb6b38ba342012b3c 100644 (file)
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -1246,6 +1246,11 @@ static int zfcp_erp_strategy(struct zfcp_erp_action *erp_action)
                goto unlock;
        }
 
+       if (erp_action->status & ZFCP_STATUS_ERP_TIMEDOUT) {
+               retval = ZFCP_ERP_FAILED;
+               goto check_target;
+       }
+
        zfcp_erp_action_to_running(erp_action);
 
        /* no lock to allow for blocking operations */
@@ -1278,6 +1283,7 @@ static int zfcp_erp_strategy(struct zfcp_erp_action *erp_action)
                goto unlock;
        }
 
+check_target:
        retval = zfcp_erp_strategy_check_target(erp_action, retval);
        zfcp_erp_action_dequeue(erp_action);
        retval = zfcp_erp_strategy_statechange(erp_action, retval);