Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (97 commits)
  [SCSI] zfcp: removed wrong comment
  [SCSI] zfcp: use of uninitialized variable
  [SCSI] zfcp: Invalid locking order
  [SCSI] aic79xx: use dma_get_required_mask()
  [SCSI] aic79xx: fix bracket mismatch in unused macro
  [SCSI] BusLogic: Replace 'boolean' by 'bool'
  [SCSI] advansys: clean up warnings
  [SCSI] 53c7xx: brackets fix in uncompiled code
  [SCSI] nsp_cs: remove old scsi code
  [SCSI] aic79xx: make ahd_match_scb() static
  [SCSI] DAC960: kmalloc->kzalloc/Casting cleanups
  [SCSI] scsi_kmap_atomic_sg(): check that local irqs are disabled
  [SCSI] Buslogic: local_irq_disable() is redundant after local_irq_save()
  [SCSI] aic94xx: update for v28 firmware
  [SCSI] scsi_error: Fix lost EH commands
  [SCSI] aic94xx: Add default bus reset handler
  [SCSI] aic94xx: Remove TMF result code munging
  [SCSI] libsas: Add an LU reset mechanism to the error handler
  [SCSI] libsas: Don't BUG when connecting two expanders via wide port
  [SCSI] st: fix Tape dies if wrong block size used, bug 7919
  ...

1 files changed, 8 insertions, 14 deletions

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 88642dec080c..421da1e7c0ea 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -838,32 +838,28 @@ zfcp_erp_action_exists(struct zfcp_erp_action *erp_action)
  *              and does appropriate preparations (dismiss fsf request, ...)
  *
  * locks:       called under erp_lock (disabled interrupts)
- *
- * returns:     0
  */
-static int
+static void
 zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *erp_action)
 {
-        int retval = 0;
-        struct zfcp_fsf_req *fsf_req = NULL;
         struct zfcp_adapter *adapter = erp_action->adapter;
 
         if (erp_action->fsf_req) {
                 /* take lock to ensure that request is not deleted meanwhile */
                 spin_lock(&adapter->req_list_lock);
-                if ((!zfcp_reqlist_ismember(adapter,
-                                            erp_action->fsf_req->req_id)) &&
-                    (fsf_req->erp_action == erp_action)) {
+                if (zfcp_reqlist_ismember(adapter,
+                                            erp_action->fsf_req->req_id)) {
                         /* fsf_req still exists */
                         debug_text_event(adapter->erp_dbf, 3, "a_ca_req");
-                        debug_event(adapter->erp_dbf, 3, &fsf_req,
+                        debug_event(adapter->erp_dbf, 3, &erp_action->fsf_req,
                                     sizeof (unsigned long));
                         /* dismiss fsf_req of timed out/dismissed erp_action */
                         if (erp_action->status & (ZFCP_STATUS_ERP_DISMISSED |
                                                   ZFCP_STATUS_ERP_TIMEDOUT)) {
                                 debug_text_event(adapter->erp_dbf, 3,
                                                  "a_ca_disreq");
-                                fsf_req->status |= ZFCP_STATUS_FSFREQ_DISMISSED;
+                                erp_action->fsf_req->status |=
+                                        ZFCP_STATUS_FSFREQ_DISMISSED;
                         }
                         if (erp_action->status & ZFCP_STATUS_ERP_TIMEDOUT) {
                                 ZFCP_LOG_NORMAL("error: erp step timed out "
@@ -876,11 +872,11 @@ zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *erp_action)
                          * then keep it running asynchronously and don't mess
                          * with the association of erp_action and fsf_req.
                          */
-                        if (fsf_req->status & (ZFCP_STATUS_FSFREQ_COMPLETED |
+                        if (erp_action->fsf_req->status &
+                                        (ZFCP_STATUS_FSFREQ_COMPLETED |
                                                ZFCP_STATUS_FSFREQ_DISMISSED)) {
                                 /* forget about association between fsf_req
                                    and erp_action */
-                                fsf_req->erp_action = NULL;
                                 erp_action->fsf_req = NULL;
                         }
                 } else {
@@ -894,8 +890,6 @@ zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *erp_action)
                 spin_unlock(&adapter->req_list_lock);
         } else
                 debug_text_event(adapter->erp_dbf, 3, "a_ca_noreq");
-
-        return retval;
 }
 
 /**