[SCSI] zfcp: Remove some port flags

PORT_PHYS_CLOSING is only set and cleared, but not actually used
for status checking.

PORT_INVALID_WWPN is set when the GID_PN request does not return
a d_id for a remote port, e.g. when a remote port has been
unplugged. For this case, the d_id is zero. In the erp we can
check the d_id and use the normal escalation procedure that gives
up after three retries and remove the special case.

PORT_NO_WWPN is unused: Each port in the remote port list has a
valid wwpn. The WKA ports are now tracked outside the port
list. Remove the PORT_NO_WWPN flag, since this is no longer set
for any port.

Acked-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>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 8af7dfbe022c..497986f6d643 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -249,8 +249,8 @@ struct zfcp_port *zfcp_get_port_by_wwpn(struct zfcp_adapter *adapter,
         struct zfcp_port *port;
 
         list_for_each_entry(port, &adapter->port_list_head, list)
-                if ((port->wwpn == wwpn) && !(atomic_read(&port->status) &
-                      (ZFCP_STATUS_PORT_NO_WWPN | ZFCP_STATUS_COMMON_REMOVE)))
+                if ((port->wwpn == wwpn) &&
+                    !(atomic_read(&port->status) & ZFCP_STATUS_COMMON_REMOVE))
                         return port;
         return NULL;
 }
@@ -620,11 +620,10 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
         dev_set_drvdata(&port->sysfs_device, port);
 
         read_lock_irq(&zfcp_data.config_lock);
-        if (!(status & ZFCP_STATUS_PORT_NO_WWPN))
-                if (zfcp_get_port_by_wwpn(adapter, wwpn)) {
-                        read_unlock_irq(&zfcp_data.config_lock);
-                        goto err_out_free;
-                }
+        if (zfcp_get_port_by_wwpn(adapter, wwpn)) {
+                read_unlock_irq(&zfcp_data.config_lock);
+                goto err_out_free;
+        }
         read_unlock_irq(&zfcp_data.config_lock);
 
         if (device_register(&port->sysfs_device))