[SCSI] zfcp: clear adapter status flags during adapter shutdown

In some cases we did not reset some adapter status flags properly.
This patch clears these flags during FCP adapter shutdown.

Signed-off-by: Volker Sameske <sameske@de.ibm.com>
Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index aef66bc2b6c..4e7cb6dc4d3 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -1986,6 +1986,10 @@ zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *erp_action, int close)
  failed_openfcp:
         zfcp_close_fsf(erp_action->adapter);
  failed_qdio:
+        atomic_clear_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK |
+                          ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |
+                          ZFCP_STATUS_ADAPTER_XPORT_OK,
+                          &erp_action->adapter->status);
  out:
         return retval;
 }
@@ -2167,6 +2171,9 @@ zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action)
                 sleep *= 2;
         }
 
+        atomic_clear_mask(ZFCP_STATUS_ADAPTER_HOST_CON_INIT,
+                          &adapter->status);
+
         if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK,
                               &adapter->status)) {
                 ZFCP_LOG_INFO("error: exchange of configuration data for "