[SCSI] zfcp: Remove function zfcp_reqlist_find_safe

Always use the FSF request id as a reference to the FSF request. With
this change the function zfcp_reqlist_find_safe is no longer needed
and can be removed.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index b51a11a82e63..d40d5b0f263f 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -478,25 +478,26 @@ static void zfcp_erp_action_to_running(struct zfcp_erp_action *erp_action)
 static void zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *act)
 {
         struct zfcp_adapter *adapter = act->adapter;
+        struct zfcp_fsf_req *req;
 
-        if (!act->fsf_req)
+        if (!act->fsf_req_id)
                 return;
 
         spin_lock(&adapter->req_list_lock);
-        if (zfcp_reqlist_find_safe(adapter, act->fsf_req) &&
-            act->fsf_req->erp_action == act) {
+        req = zfcp_reqlist_find(adapter, act->fsf_req_id);
+        if (req && req->erp_action == act) {
                 if (act->status & (ZFCP_STATUS_ERP_DISMISSED |
                                    ZFCP_STATUS_ERP_TIMEDOUT)) {
-                        act->fsf_req->status |= ZFCP_STATUS_FSFREQ_DISMISSED;
+                        req->status |= ZFCP_STATUS_FSFREQ_DISMISSED;
                         zfcp_dbf_rec_action("erscf_1", act);
-                        act->fsf_req->erp_action = NULL;
+                        req->erp_action = NULL;
                 }
                 if (act->status & ZFCP_STATUS_ERP_TIMEDOUT)
                         zfcp_dbf_rec_action("erscf_2", act);
-                if (act->fsf_req->status & ZFCP_STATUS_FSFREQ_DISMISSED)
-                        act->fsf_req = NULL;
+                if (req->status & ZFCP_STATUS_FSFREQ_DISMISSED)
+                        act->fsf_req_id = 0;
         } else
-                act->fsf_req = NULL;
+                act->fsf_req_id = 0;
         spin_unlock(&adapter->req_list_lock);
 }