FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-17 14:30:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SCSI] zfcp: fix double dbf id usage

Browse Source 
Trace ids 107 and 3 are used twice, fix this to have unique ids for
the erp triggers.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Swen Schillig 2008-10-01 12:42:26 +02:00 committed by James Bottomley
parent 091694a556
commit 41bfcf9010
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/s390/scsi/zfcp_dbf.c
View File

@ -572,7 +572,7 @@ static const char *zfcp_rec_dbf_ids[] = {
[81] = "shared read-write unit access unsupported", [81] = "shared read-write unit access unsupported",
[82] = "incoming rscn", [82] = "incoming rscn",
[83] = "incoming wwpn", [83] = "incoming wwpn",
[84] = "", [84] = "wka port handle not valid close port",
[85] = "online", [85] = "online",
[86] = "offline", [86] = "offline",
[87] = "ccw device gone", [87] = "ccw device gone",

2
drivers/s390/scsi/zfcp_erp.c
View File

@ -1443,7 +1443,7 @@ void zfcp_erp_thread_kill(struct zfcp_adapter *adapter)
{ {
atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_KILL, &adapter->status); atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_KILL, &adapter->status);
up(&adapter->erp_ready_sem); up(&adapter->erp_ready_sem);
zfcp_rec_dbf_event_thread_lock(2, adapter); zfcp_rec_dbf_event_thread_lock(3, adapter);
wait_event(adapter->erp_thread_wqh, wait_event(adapter->erp_thread_wqh,
!(atomic_read(&adapter->status) & !(atomic_read(&adapter->status) &

2
drivers/s390/scsi/zfcp_fsf.c
View File

@ -1641,7 +1641,7 @@ static void zfcp_fsf_close_wka_port_handler(struct zfcp_fsf_req *req)
if (req->qtcb->header.fsf_status == FSF_PORT_HANDLE_NOT_VALID) { if (req->qtcb->header.fsf_status == FSF_PORT_HANDLE_NOT_VALID) {
req->status |= ZFCP_STATUS_FSFREQ_ERROR; req->status |= ZFCP_STATUS_FSFREQ_ERROR;
zfcp_erp_adapter_reopen(wka_port->adapter, 0, 107, req); zfcp_erp_adapter_reopen(wka_port->adapter, 0, 84, req);
} }
wka_port->status = ZFCP_WKA_PORT_OFFLINE; wka_port->status = ZFCP_WKA_PORT_OFFLINE;