]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: zfcp: update kernel message for invalid FCP_CMND length, it's not the CDB
authorSteffen Maier <maier@linux.ibm.com>
Thu, 8 Nov 2018 14:44:47 +0000 (15:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Dec 2019 07:51:21 +0000 (08:51 +0100)
[ 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>
drivers/s390/scsi/zfcp_fsf.c

index df888506e363e475df608a4cc87fc7811c89d302..91aa4bfcf8d612041ce5ffad18681f02fc01c62f 100644 (file)
@@ -2104,11 +2104,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(req->adapter, 0, "fssfch4");
                req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                break;