Skip to content

Commit a6e1c6c

Browse files
steffen-maierZhengShunQian
authored andcommitted
scsi: zfcp: fix missing REC trigger trace on enqueue without ERP thread
commit 6a76550 upstream. 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: Steffen Maier <maier@linux.ibm.com> Cc: <stable@vger.kernel.org> #2.6.38+ Reviewed-by: Benjamin Block <bblock@linux.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 30fa41f commit a6e1c6c

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/s390/scsi/zfcp_erp.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,11 @@ static int zfcp_erp_action_enqueue(int want, struct zfcp_adapter *adapter,
314314
goto out;
315315
}
316316

317-
if (!adapter->erp_thread)
318-
return -EIO;
317+
if (!adapter->erp_thread) {
318+
need = ZFCP_ERP_ACTION_NONE; /* marker for trace */
319+
retval = -EIO;
320+
goto out;
321+
}
319322

320323
need = zfcp_erp_required_act(want, adapter, port, sdev);
321324
if (!need)

0 commit comments

Comments
 (0)