diff options
author | Christof Schmitt <christof.schmitt@de.ibm.com> | 2010-07-08 03:53:10 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-28 10:46:42 -0400 |
commit | f7bd7c3627a3cf06bf1c6da55339469ec1853a48 (patch) | |
tree | 8db048d228168cae0a3e2082a0d77fa1a715aac9 | |
parent | 9c785d944e6fa7eef390c799b93e43243505780c (diff) |
[SCSI] zfcp: Fix retry after failed "open port" erp action
Trying to enqueue a port erp action from the port erp strategy will
fail in zfcp_erp_required_act. To try the same action again, return
ZFCP_ERP_FAILED.
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>
-rw-r--r-- | drivers/s390/scsi/zfcp_erp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 64471ba6ac09..160b432c907f 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c | |||
@@ -897,8 +897,7 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act) | |||
897 | } | 897 | } |
898 | if (port->d_id && !(p_status & ZFCP_STATUS_COMMON_NOESC)) { | 898 | if (port->d_id && !(p_status & ZFCP_STATUS_COMMON_NOESC)) { |
899 | port->d_id = 0; | 899 | port->d_id = 0; |
900 | _zfcp_erp_port_reopen(port, 0, "erpsoc1", NULL); | 900 | return ZFCP_ERP_FAILED; |
901 | return ZFCP_ERP_EXIT; | ||
902 | } | 901 | } |
903 | /* fall through otherwise */ | 902 | /* fall through otherwise */ |
904 | } | 903 | } |