Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41bfcf90 authored by Swen Schillig's avatar Swen Schillig Committed by James Bottomley
Browse files

[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: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 091694a5

drivers/s390/scsi/zfcp_dbf.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

drivers/s390/scsi/zfcp_erp.c

+1 −1
Original line number Diff line number Diff line
@@ -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) &

drivers/s390/scsi/zfcp_fsf.c

+1 −1
Original line number Diff line number Diff line
@@ -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;