[SCSI] zfcp: Adapter reopen for large number of unsolicited status

When zfcp receives 16 unsolicited status messages, this could trigger
an adapter reopen. In this case, first try to send a new status read,
and only if this fails, go through the recovery.

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, 7 insertions, 8 deletions

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 2bd80fdcceff..bfcd1ba28ae1 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -550,15 +550,14 @@ static void zfcp_dummy_release(struct device *dev)
 int zfcp_status_read_refill(struct zfcp_adapter *adapter)
 {
         while (atomic_read(&adapter->stat_miss) > 0)
-                if (zfcp_fsf_status_read(adapter, ZFCP_WAIT_FOR_SBAL))
+                if (zfcp_fsf_status_read(adapter, ZFCP_WAIT_FOR_SBAL)) {
+                        if (atomic_read(&adapter->stat_miss) >= 16) {
+                                zfcp_erp_adapter_reopen(adapter, 0, 103, NULL);
+                                return 1;
+                        }
                         break;
-        else
-                atomic_dec(&adapter->stat_miss);
-
-        if (ZFCP_STATUS_READS_RECOM <= atomic_read(&adapter->stat_miss)) {
-                zfcp_erp_adapter_reopen(adapter, 0, 103, NULL);
-                return 1;
-        }
+                } else
+                        atomic_dec(&adapter->stat_miss);
         return 0;
 }