Merge branch 'linus' into x86/pat2

Conflicts:
	arch/x86/mm/init_64.c

1 files changed, 12 insertions, 21 deletions

diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index e984469bb98b..56196c98c07b 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -39,18 +39,6 @@ struct zfcp_gpn_ft {
         struct scatterlist sg_resp[ZFCP_GPN_FT_BUFFERS];
 };
 
-static struct zfcp_port *zfcp_get_port_by_did(struct zfcp_adapter *adapter,
-                                              u32 d_id)
-{
-        struct zfcp_port *port;
-
-        list_for_each_entry(port, &adapter->port_list_head, list)
-                if ((port->d_id == d_id) &&
-                    !atomic_test_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status))
-                        return port;
-        return NULL;
-}
-
 static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
                                    struct fcp_rscn_element *elem)
 {
@@ -341,12 +329,13 @@ void zfcp_test_link(struct zfcp_port *port)
 
         zfcp_port_get(port);
         retval = zfcp_fc_adisc(port);
-        if (retval == 0 || retval == -EBUSY)
+        if (retval == 0)
                 return;
 
         /* send of ADISC was not possible */
         zfcp_port_put(port);
-        zfcp_erp_port_forced_reopen(port, 0, 65, NULL);
+        if (retval != -EBUSY)
+                zfcp_erp_port_forced_reopen(port, 0, 65, NULL);
 }
 
 static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter)
@@ -363,7 +352,6 @@ static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter)
                 if (ret)
                         return ret;
                 zfcp_erp_wait(adapter);
-                zfcp_port_put(adapter->nameserver_port);
         }
         return !atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED,
                                   &adapter->nameserver_port->status);
@@ -475,7 +463,7 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
         struct zfcp_adapter *adapter = ct->port->adapter;
         struct zfcp_port *port, *tmp;
         u32 d_id;
-        int ret = 0, x;
+        int ret = 0, x, last = 0;
 
         if (ct->status)
                 return -EIO;
@@ -492,19 +480,24 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
         down(&zfcp_data.config_sema);
 
         /* first entry is the header */
-        for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES; x++) {
+        for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES && !last; x++) {
                 if (x % (ZFCP_GPN_FT_ENTRIES + 1))
                         acc++;
                 else
                         acc = sg_virt(++sg);
 
+                last = acc->control & 0x80;
                 d_id = acc->port_id[0] << 16 | acc->port_id[1] << 8 |
                        acc->port_id[2];
 
                 /* skip the adapter's port and known remote ports */
-                if (acc->wwpn == fc_host_port_name(adapter->scsi_host) ||
-                     zfcp_get_port_by_did(adapter, d_id))
+                if (acc->wwpn == fc_host_port_name(adapter->scsi_host))
+                        continue;
+                port = zfcp_get_port_by_wwpn(adapter, acc->wwpn);
+                if (port) {
+                        zfcp_port_get(port);
                         continue;
+                }
 
                 port = zfcp_port_enqueue(adapter, acc->wwpn,
                                          ZFCP_STATUS_PORT_DID_DID |
@@ -513,8 +506,6 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
                         ret = PTR_ERR(port);
                 else
                         zfcp_erp_port_reopen(port, 0, 149, NULL);
-                if (acc->control & 0x80) /* last entry */
-                        break;
         }
 
         zfcp_erp_wait(adapter);