Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c785d94 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[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: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 835dc298

drivers/s390/scsi/zfcp_erp.c

+6 −0
Original line number Diff line number Diff line
@@ -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);