| From: Steffen Maier <maier@linux.ibm.com> |
| Date: Thu, 17 May 2018 19:14:49 +0200 |
| Subject: scsi: zfcp: fix missing REC trigger trace on enqueue without ERP |
| thread |
| |
| commit 6a76550841d412330bd86aed3238d1888ba70f0e 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> |
| Reviewed-by: Benjamin Block <bblock@linux.ibm.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/s390/scsi/zfcp_erp.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/s390/scsi/zfcp_erp.c |
| +++ b/drivers/s390/scsi/zfcp_erp.c |
| @@ -314,8 +314,11 @@ static int zfcp_erp_action_enqueue(int w |
| 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) |
