Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9528539c authored by Swen Schillig's avatar Swen Schillig Committed by James Bottomley
Browse files

[SCSI] zfcp: Fix reference counter for remote ports 



Fix the remote port reference counter handling during ELS ADISC
commands and find the remote port by WWPN not by D_IDs that could
change.

Signed-off-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent f48bf7fb

drivers/s390/scsi/zfcp_fc.c

+9 −16
Original line number Diff line number Diff line
@@ -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,11 +329,12 @@ 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);

	if (retval != -EBUSY)

		zfcp_erp_port_forced_reopen(port, 0, 65, NULL);

}
@@ -503,9 +492,13 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft) 
		       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 |