Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 144442
b: refs/heads/master
c: 6ab35c0
h: refs/heads/master
v: v3
  • Loading branch information
Martin Petermann authored and James Bottomley committed Apr 27, 2009
1 parent 120f24d commit 9a4571f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7001f0c4863230dd1560425fa0f5aad9e21716b8
refs/heads/master: 6ab35c0713daf8cd68f272a4be8dfc02c86bbd3b
7 changes: 4 additions & 3 deletions trunk/drivers/s390/scsi/zfcp_fc.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,9 @@ static void zfcp_validate_port(struct zfcp_port *port)
{
struct zfcp_adapter *adapter = port->adapter;

if (!(atomic_read(&port->status) & ZFCP_STATUS_COMMON_NOESC))
return;

atomic_clear_mask(ZFCP_STATUS_COMMON_NOESC, &port->status);

if ((port->supported_classes != 0) ||
Expand Down Expand Up @@ -599,10 +602,8 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft, int max_entries)
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);
if (port)
continue;
}

port = zfcp_port_enqueue(adapter, acc->wwpn,
ZFCP_STATUS_COMMON_NOESC, d_id);
Expand Down

0 comments on commit 9a4571f

Please sign in to comment.