From 73b293f726d1169c8b2f544471192390f231f43d Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Thu, 20 Dec 2007 12:30:22 +0100
Subject: [PATCH] --- yaml --- r: 77080 b: refs/heads/master c:
 d1ad09db2fd551d49d65ef040591cb9298e70fb6 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/s390/scsi/zfcp_def.h | 14 ++++++++++++++
 trunk/drivers/s390/scsi/zfcp_erp.c |  3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 09f12a044c55..702e3905d895 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfd90dce248a49ced2b7419ecf78af9f7f37039e
+refs/heads/master: d1ad09db2fd551d49d65ef040591cb9298e70fb6
diff --git a/trunk/drivers/s390/scsi/zfcp_def.h b/trunk/drivers/s390/scsi/zfcp_def.h
index 294d0792e82b..9e9f6c1e4e5d 100644
--- a/trunk/drivers/s390/scsi/zfcp_def.h
+++ b/trunk/drivers/s390/scsi/zfcp_def.h
@@ -1123,6 +1123,20 @@ zfcp_reqlist_find(struct zfcp_adapter *adapter, unsigned long req_id)
 	return NULL;
 }
 
+static inline struct zfcp_fsf_req *
+zfcp_reqlist_find_safe(struct zfcp_adapter *adapter, struct zfcp_fsf_req *req)
+{
+	struct zfcp_fsf_req *request;
+	unsigned int idx;
+
+	for (idx = 0; idx < REQUEST_LIST_SIZE; idx++) {
+		list_for_each_entry(request, &adapter->req_list[idx], list)
+			if (request == req)
+				return request;
+	}
+	return NULL;
+}
+
 /*
  *  functions needed for reference/usage counting
  */
diff --git a/trunk/drivers/s390/scsi/zfcp_erp.c b/trunk/drivers/s390/scsi/zfcp_erp.c
index 67d74ed0f25c..76fef3f6387e 100644
--- a/trunk/drivers/s390/scsi/zfcp_erp.c
+++ b/trunk/drivers/s390/scsi/zfcp_erp.c
@@ -846,7 +846,8 @@ zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *erp_action)
 	if (erp_action->fsf_req) {
 		/* take lock to ensure that request is not deleted meanwhile */
 		spin_lock(&adapter->req_list_lock);
-		if (zfcp_reqlist_find(adapter, erp_action->fsf_req->req_id)) {
+		if (zfcp_reqlist_find_safe(adapter, erp_action->fsf_req) &&
+		    erp_action->fsf_req->erp_action == erp_action) {
 			/* fsf_req still exists */
 			debug_text_event(adapter->erp_dbf, 3, "a_ca_req");
 			debug_event(adapter->erp_dbf, 3, &erp_action->fsf_req,