[SCSI] zfcp: remove undefined subtype for status read response

The status read response FSF_STATUS_READ_SUB_ERROR_PORT is not
defined in the specs and therefore not valid.
All occurrences are removed from the code.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.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 cb6df609953e1b7456f567fd5ec926519659e00c..ab843f23d42865b5d8c23e18b114a2e202beaa54 100644 (file)
--- a/drivers/s390/scsi/zfcp_dbf.c
+++ b/drivers/s390/scsi/zfcp_dbf.c
@@ -615,7 +615,7 @@ static const char *zfcp_rec_dbf_ids[] = {
        [119]   = "unknown protocol status",
        [120]   = "unknown fsf command",
        [121]   = "no recommendation for status qualifier",
-       [122]   = "status read physical port closed in error",
+       [122]   = "",
        [123]   = "fc service class not supported",
        [124]   = "",
        [125]   = "need newer zfcp",

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 9c3f91a343f3a2f6daea6fb29dfa64124fb485ee..698e42214a375c4b7c243296bf01a616522641c5 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -162,14 +162,7 @@ static void zfcp_fsf_status_read_port_closed(struct zfcp_fsf_req *req)
        list_for_each_entry(port, &adapter->port_list_head, list)
                if (port->d_id == d_id) {
                        read_unlock_irqrestore(&zfcp_data.config_lock, flags);
-                       switch (sr_buf->status_subtype) {
-                       case FSF_STATUS_READ_SUB_CLOSE_PHYS_PORT:
-                               zfcp_erp_port_reopen(port, 0, 101, req);
-                               break;
-                       case FSF_STATUS_READ_SUB_ERROR_PORT:
-                               zfcp_erp_port_shutdown(port, 0, 122, req);
-                               break;
-                       }
+                       zfcp_erp_port_reopen(port, 0, 101, req);
                        return;
                }
        read_unlock_irqrestore(&zfcp_data.config_lock, flags);

diff --git a/drivers/s390/scsi/zfcp_fsf.h b/drivers/s390/scsi/zfcp_fsf.h
index 8bb200252347420e8ebaf3575bf5d2653bb171b0..df7f232faba8ab8e22418f76a528fdd81666933a 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.h
+++ b/drivers/s390/scsi/zfcp_fsf.h
@@ -127,10 +127,6 @@
 #define FSF_STATUS_READ_CFDC_UPDATED           0x0000000A
 #define FSF_STATUS_READ_FEATURE_UPDATE_ALERT   0x0000000C
 
-/* status subtypes in status read buffer */
-#define FSF_STATUS_READ_SUB_CLOSE_PHYS_PORT    0x00000001
-#define FSF_STATUS_READ_SUB_ERROR_PORT         0x00000002
-
 /* status subtypes for link down */
 #define FSF_STATUS_READ_SUB_NO_PHYSICAL_LINK   0x00000000
 #define FSF_STATUS_READ_SUB_FDISC_FAILED       0x00000001