diff options
| author | Christof Schmitt | 2010-02-17 11:18:50 +0100 |
|---|---|---|
| committer | James Bottomley | 2010-02-18 00:46:19 +0100 |
| commit | b6bd2fb92a7bb9f1f3feecd9945c21e6c227dd51 (patch) | |
| tree | 764374b8317b504336ef0c9ba4160ff7124c3e10 /drivers/s390/scsi/zfcp_erp.c | |
| parent | [SCSI] zfcp: Remove function zfcp_reqlist_find_safe (diff) | |
| download | kernel-qcow2-linux-b6bd2fb92a7bb9f1f3feecd9945c21e6c227dd51.tar.gz kernel-qcow2-linux-b6bd2fb92a7bb9f1f3feecd9945c21e6c227dd51.tar.xz kernel-qcow2-linux-b6bd2fb92a7bb9f1f3feecd9945c21e6c227dd51.zip | |
[SCSI] zfcp: Move FSF request tracking code to new file
Move the code for tracking FSF requests to new file to have this code
in one place. The functions for adding and removing requests on the
I/O path are already inline. The alloc and free functions are only
called once, so it does not hurt to inline them and add them to the
same file.
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>
Diffstat (limited to 'drivers/s390/scsi/zfcp_erp.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_erp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index d40d5b0f263f..fe8e4c2b9563 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c @@ -11,6 +11,7 @@ #include <linux/kthread.h> #include "zfcp_ext.h" +#include "zfcp_reqlist.h" #define ZFCP_MAX_ERPS 3 @@ -483,8 +484,8 @@ static void zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *act) if (!act->fsf_req_id) return; - spin_lock(&adapter->req_list_lock); - req = zfcp_reqlist_find(adapter, act->fsf_req_id); + spin_lock(&adapter->req_list->lock); + req = _zfcp_reqlist_find(adapter->req_list, act->fsf_req_id); if (req && req->erp_action == act) { if (act->status & (ZFCP_STATUS_ERP_DISMISSED | ZFCP_STATUS_ERP_TIMEDOUT)) { @@ -498,7 +499,7 @@ static void zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *act) act->fsf_req_id = 0; } else act->fsf_req_id = 0; - spin_unlock(&adapter->req_list_lock); + spin_unlock(&adapter->req_list->lock); } /** |