From 4a8f03ce78a81142e3e6baf1d604c3bfc4dac1d1 Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Thu, 8 Jul 2010 09:53:09 +0200 Subject: [PATCH] --- yaml --- r: 204311 b: refs/heads/master c: 9c785d944e6fa7eef390c799b93e43243505780c h: refs/heads/master i: 204309: 16004fcbc3948984bd3ee0a1d86a1a03e2d853d4 204307: 665b81c6010e049bf0da5cebadf41bd65cb427f0 204303: 4b0e497b38dd0a2c5e93996a29fa5bf219885746 v: v3 --- [refs] | 2 +- trunk/drivers/s390/scsi/zfcp_erp.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c45c71aac192..f69cfeee8a49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 835dc29887073eec7817559a07558f955383d099 +refs/heads/master: 9c785d944e6fa7eef390c799b93e43243505780c diff --git a/trunk/drivers/s390/scsi/zfcp_erp.c b/trunk/drivers/s390/scsi/zfcp_erp.c index 03cd6365ed04..64471ba6ac09 100644 --- a/trunk/drivers/s390/scsi/zfcp_erp.c +++ b/trunk/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);