scsi: zfcp: update kernel message for invalid FCP_CMND length, it's not the CDB

BugLink: https://bugs.launchpad.net/bugs/1857158
[ Upstream commit 724e144387f4d7e7668d3da913d0efc44a9b4664 ]

The CDB is just a part inside of FCP_CMND, see zfcp_fc_scsi_to_fcp().
While at it, fix the device driver reaction: adapter not LUN shutdown.

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: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 8fbfb062fcca10bb1086fb2a379f88a30636bdc2..f29bf2d977b15d53a1388db57d49d5776e745c4d 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -2091,11 +2091,8 @@ static void zfcp_fsf_fcp_handler_common(struct zfcp_fsf_req *req)
                break;
        case FSF_CMND_LENGTH_NOT_VALID:
                dev_err(&req->adapter->ccw_device->dev,
-                       "Incorrect CDB length %d, LUN 0x%016Lx on "
-                       "port 0x%016Lx closed\n",
-                       req->qtcb->bottom.io.fcp_cmnd_length,
-                       (unsigned long long)zfcp_scsi_dev_lun(sdev),
-                       (unsigned long long)zfcp_sdev->port->wwpn);
+                       "Incorrect FCP_CMND length %d, FCP device closed\n",
+                       req->qtcb->bottom.io.fcp_cmnd_length);
                zfcp_erp_adapter_shutdown(zfcp_sdev->port->adapter, 0,
                                          "fssfch4");
                req->status |= ZFCP_STATUS_FSFREQ_ERROR;