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

Commit 6a765508 authored by Steffen Maier's avatar Steffen Maier Committed by Martin K. Petersen
Browse files

scsi: zfcp: fix missing REC trigger trace on enqueue without ERP thread 



Example trace record formatted with zfcpdbf from s390-tools:

Timestamp      : ...
Area           : REC
Subarea        : 00
Level          : 1
Exception      : -
CPU ID         : ..
Caller         : 0x...
Record ID      : 1                      ZFCP_DBF_REC_TRIG
Tag            : .......
LUN            : 0x...
WWPN           : 0x...
D_ID           : 0x...
Adapter status : 0x...
Port status    : 0x...
LUN status     : 0x...
Ready count    : 0x...
Running count  : 0x...
ERP want       : 0x0.                   ZFCP_ERP_ACTION_REOPEN_...
ERP need       : 0xc0                   ZFCP_ERP_ACTION_NONE

Signed-off-by: default avatarSteffen Maier <maier@linux.ibm.com>
Cc: <stable@vger.kernel.org> #2.6.38+
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8c3d20aa

drivers/s390/scsi/zfcp_erp.c

+5 −2
Original line number Diff line number Diff line
@@ -315,8 +315,11 @@ static int zfcp_erp_action_enqueue(int want, struct zfcp_adapter *adapter, 
		goto out;

	}



	if (!adapter->erp_thread)

		return -EIO;

	if (!adapter->erp_thread) {

		need = ZFCP_ERP_ACTION_NONE; /* marker for trace */

		retval = -EIO;

		goto out;

	}



	need = zfcp_erp_required_act(want, adapter, port, sdev);

	if (!need)