[SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down

Fix the fix ... One of my previous fixes introduced removal of all fsf
requests in zfcp's eh_host_reset_handler. But this must not happen
before qdio queues are shut down. So, I revert the changes of
zfcp_scsi_eh_host_reset_handler.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 2 insertions, 17 deletions

diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 753bb9b2fe74..7cafa34e4c7f 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -544,7 +544,6 @@ int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt)
 {
         struct zfcp_unit *unit;
         struct zfcp_adapter *adapter;
-        unsigned long flags;
 
         unit = (struct zfcp_unit*) scpnt->device->hostdata;
         adapter = unit->port->adapter;
@@ -552,22 +551,8 @@ int zfcp_scsi_eh_host_reset_handler(struct scsi_cmnd *scpnt)
         ZFCP_LOG_NORMAL("host/bus reset because of problems with "
                         "unit 0x%016Lx\n", unit->fcp_lun);
 
-        write_lock_irqsave(&adapter->erp_lock, flags);
-        if (atomic_test_mask(ZFCP_STATUS_ADAPTER_ERP_PENDING,
-                             &adapter->status)) {
-                zfcp_erp_modify_adapter_status(adapter,
-                       ZFCP_STATUS_COMMON_UNBLOCKED|ZFCP_STATUS_COMMON_OPEN,
-                       ZFCP_CLEAR);
-                zfcp_erp_action_dismiss_adapter(adapter);
-                write_unlock_irqrestore(&adapter->erp_lock, flags);
-                zfcp_fsf_req_dismiss_all(adapter);
-                adapter->fsf_req_seq_no = 0;
-                zfcp_erp_adapter_reopen(adapter, 0);
-        } else {
-                write_unlock_irqrestore(&adapter->erp_lock, flags);
-                zfcp_erp_adapter_reopen(adapter, 0);
-                zfcp_erp_wait(adapter);
-        }
+        zfcp_erp_adapter_reopen(adapter, 0);
+        zfcp_erp_wait(adapter);
 
         return SUCCESS;
 }