[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>

diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 9c9f9cfcd46d504a6d1bb4b4073f9fc3f3569a5f..060f5f2352ecb590b74e8667bb703fb1c0e62bc1 100644 (file)
--- 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 26049c66343896c1b4c66209f902761ccc61c117..782313131870ad928bc9a9a4072a5d3e5503ec02 100644 (file)
--- 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 600ef5711acb6a36050c490d0995c668e97b710a..739356a5c123f9310c944739c584e0eb9604cace 100644 (file)
--- 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;