[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>

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 64471ba6ac09ffa5a6faa75bb6b38ba342012b3c..160b432c907f393cb1d134f0398964874ede3cdc 100644 (file)
--- 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)
                }
                if (port->d_id && !(p_status & ZFCP_STATUS_COMMON_NOESC)) {
                        port->d_id = 0;
-                       _zfcp_erp_port_reopen(port, 0, "erpsoc1", NULL);
-                       return ZFCP_ERP_EXIT;
+                       return ZFCP_ERP_FAILED;
                }
                /* fall through otherwise */
        }