diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2007-05-08 11:17:54 +0200 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-08 18:56:50 +0200 |
commit | ca2d02c2f9ea476062ae181eec60b8bcd97857d6 (patch) | |
tree | dffe33856db601a173a117263b9ee4799d555ac6 /drivers/s390/scsi/zfcp_erp.c | |
parent | [SCSI] zfcp: Fix deadlock between zfcp ERP and SCSI (diff) | |
download | linux-ca2d02c2f9ea476062ae181eec60b8bcd97857d6.tar.xz linux-ca2d02c2f9ea476062ae181eec60b8bcd97857d6.zip |
[SCSI] zfcp: rework request ID management.
Simplify request ID management and make sure that frequently used
functions are inlined. Also fix a memory leak in zfcp_adapter_enqueue()
which only gets hit in error handling.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/s390/scsi/zfcp_erp.c')
-rw-r--r-- | drivers/s390/scsi/zfcp_erp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 885572300589..e2a3d6fe1651 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c @@ -847,8 +847,7 @@ 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_ismember(adapter, - erp_action->fsf_req->req_id)) { + if (zfcp_reqlist_find(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, &erp_action->fsf_req, |