[SCSI] zfcp: Remove unnecessary warning message

Remove a message that was emitted for a port that could not initially
be opened. This is a rare case when the port discovery hits an
initiator port and only confuses the user with an initator port logged
in the message. Remove the whole special case: The failed "open port"
request triggers required follow-up actions anyway.

Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Acked-by: Felix Beck <felix@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c
index 150bd5390b1d3f72227e41b9357cd50d1b810f05..cb6df609953e1b7456f567fd5ec926519659e00c 100644 (file)
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -522,7 +522,7 @@ static const char *zfcp_rec_dbf_ids[] = {
        [29]    = "link down",
        [30]    = "link up status read",
        [31]    = "open port failed",
-       [32]    = "open port failed",
+       [32]    = "",
        [33]    = "close port",
        [34]    = "open unit failed",
        [35]    = "exclusive open unit failed",

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 9bba56b168319f6d7c7fc5926186ee1d26db93a0..e6416f8541b0274e0692b84f60e3f3b26f093b83 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -1423,13 +1423,7 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
                switch (header->fsf_status_qual.word[0]) {
                case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
                case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
-                       req->status |= ZFCP_STATUS_FSFREQ_ERROR;
-                       break;
                case FSF_SQ_NO_RETRY_POSSIBLE:
-                       dev_warn(&req->adapter->ccw_device->dev,
-                                "Remote port 0x%016Lx could not be opened\n",
-                                (unsigned long long)port->wwpn);
-                       zfcp_erp_port_failed(port, 32, req);
                        req->status |= ZFCP_STATUS_FSFREQ_ERROR;
                        break;
                }