[SCSI] zfcp: Changed D_ID left port disabled

If the destination ID (D_ID) of a remote storage port changed, e.g.
re-plugged cable on the switch in a different switch port, the port
was never (re-)attached within Linux. This patch fixes the broken
mapping between the WWPN and the D_ID.

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

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 3f64aded6caa..e50ea465bc2b 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -895,8 +895,13 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
                                 act->step = ZFCP_ERP_STEP_PORT_CLOSING;
                                 return ZFCP_ERP_CONTINUES;
                         }
-                /* fall through otherwise */
                 }
+                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;
+                }
+                /* fall through otherwise */
         }
         return ZFCP_ERP_FAILED;
 }