diff options
| author | Swen Schillig <swen@vnet.ibm.com> | 2008-10-01 12:42:26 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-10-03 19:11:56 +0200 |
| commit | 41bfcf90101601f9507240ff0435c1b73d28a132 (patch) | |
| tree | 7520b2b4a62960a924b3bd95cee3f675ad70592c /drivers | |
| parent | [SCSI] zfcp: wait on SCSI work to be finished before proceeding with init dev (diff) | |
| download | linux-41bfcf90101601f9507240ff0435c1b73d28a132.tar.xz linux-41bfcf90101601f9507240ff0435c1b73d28a132.zip | |
[SCSI] zfcp: fix double dbf id usage
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/scsi/zfcp_dbf.c | 2 | ||||
| -rw-r--r-- | drivers/s390/scsi/zfcp_erp.c | 2 | ||||
| -rw-r--r-- | drivers/s390/scsi/zfcp_fsf.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c index 9c9f9cfcd46d..060f5f2352ec 100644 --- a/drivers/s390/scsi/zfcp_dbf.c +++ b/drivers/s390/scsi/zfcp_dbf.c @@ -572,7 +572,7 @@ static const char *zfcp_rec_dbf_ids[] = { [81] = "shared read-write unit access unsupported", [82] = "incoming rscn", [83] = "incoming wwpn", - [84] = "", + [84] = "wka port handle not valid close port", [85] = "online", [86] = "offline", [87] = "ccw device gone", diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 26049c663438..782313131870 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c @@ -1443,7 +1443,7 @@ void zfcp_erp_thread_kill(struct zfcp_adapter *adapter) { atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_KILL, &adapter->status); 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, !(atomic_read(&adapter->status) & diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 600ef5711acb..739356a5c123 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c @@ -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) { 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; |