1 files changed, 16 insertions, 35 deletions

diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 1e12a78e8edd..bdf5782b8a7a 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -222,7 +222,7 @@ zfcp_qdio_handler_error_check(struct zfcp_adapter *adapter, unsigned int status,
                 * Since we have been using this adapter, it is save to assume
                 * that it is not failed but recoverable. The card seems to
                 * report link-up events by self-initiated queue shutdown.
-                * That is why we need to clear the the link-down flag
+                * That is why we need to clear the link-down flag
                 * which is set again in case we have missed by a mile.
                 */
                zfcp_erp_adapter_reopen(
@@ -283,10 +283,10 @@ zfcp_qdio_request_handler(struct ccw_device *ccw_device,
 }
 
 /**
- * zfcp_qdio_reqid_check - checks for valid reqids or unsolicited status
+ * zfcp_qdio_reqid_check - checks for valid reqids.
  */
-static int zfcp_qdio_reqid_check(struct zfcp_adapter *adapter, 
-                                 unsigned long req_id)
+static void zfcp_qdio_reqid_check(struct zfcp_adapter *adapter,
+                                  unsigned long req_id)
 {
         struct zfcp_fsf_req *fsf_req;
         unsigned long flags;
@@ -294,23 +294,22 @@ static int zfcp_qdio_reqid_check(struct zfcp_adapter *adapter,
         debug_long_event(adapter->erp_dbf, 4, req_id);
 
         spin_lock_irqsave(&adapter->req_list_lock, flags);
-        fsf_req = zfcp_reqlist_ismember(adapter, req_id);
+        fsf_req = zfcp_reqlist_find(adapter, req_id);
 
-        if (!fsf_req) {
-                spin_unlock_irqrestore(&adapter->req_list_lock, flags);
-                ZFCP_LOG_NORMAL("error: unknown request id (%ld).\n", req_id);
-                zfcp_erp_adapter_reopen(adapter, 0);
-                return -EINVAL;
-        }
+        if (!fsf_req)
+                /*
+                 * Unknown request means that we have potentially memory
+                 * corruption and must stop the machine immediatly.
+                 */
+                panic("error: unknown request id (%ld) on adapter %s.\n",
+                      req_id, zfcp_get_busid_by_adapter(adapter));
 
-        zfcp_reqlist_remove(adapter, req_id);
+        zfcp_reqlist_remove(adapter, fsf_req);
         atomic_dec(&adapter->reqs_active);
         spin_unlock_irqrestore(&adapter->req_list_lock, flags);
 
         /* finish the FSF request */
         zfcp_fsf_req_complete(fsf_req);
-
-        return 0;
 }
 
 /*
@@ -374,27 +373,9 @@ zfcp_qdio_response_handler(struct ccw_device *ccw_device,
 
                         /* look for QDIO request identifiers in SB */
                         buffere = &buffer->element[buffere_index];
-                        retval = zfcp_qdio_reqid_check(adapter,
-                                        (unsigned long) buffere->addr);
-
-                        if (retval) {
-                                ZFCP_LOG_NORMAL("bug: unexpected inbound "
-                                                "packet on adapter %s "
-                                                "(reqid=0x%lx, "
-                                                "first_element=%d, "
-                                                "elements_processed=%d)\n",
-                                                zfcp_get_busid_by_adapter(adapter),
-                                                (unsigned long) buffere->addr,
-                                                first_element,
-                                                elements_processed);
-                                ZFCP_LOG_NORMAL("hex dump of inbound buffer "
-                                                "at address %p "
-                                                "(buffer_index=%d, "
-                                                "buffere_index=%d)\n", buffer,
-                                                buffer_index, buffere_index);
-                                ZFCP_HEX_DUMP(ZFCP_LOG_LEVEL_NORMAL,
-                                              (char *) buffer, SBAL_SIZE);
-                        }
+                        zfcp_qdio_reqid_check(adapter,
+                                              (unsigned long) buffere->addr);
+
                         /*
                          * A single used SBALE per inbound SBALE has been
                          * implemented by QDIO so far. Hope they will