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

Commit 835dc298 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Use forced_reopen in terminate_rport_io callback 



When running in non-NPIV mode, the port_reopen in terminate_rport_io
might succeed even though the remote port is not available. If the
same port connection is held open from another operating system, the
reopen is only a virtual operation and might not hit the SAN. Fix this
by changing the call to forced_reopen that forces a logout/login
operation in the SAN.

Reviewed-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@suse.de>
parent 5a7de559

drivers/s390/scsi/zfcp_scsi.c

+5 −3
Original line number Diff line number Diff line
@@ -506,8 +506,10 @@ static void zfcp_set_rport_dev_loss_tmo(struct fc_rport *rport, u32 timeout) 
 * @rport: The FC rport where to teminate I/O

 *

 * Abort all pending SCSI commands for a port by closing the

 * port. Using a reopen avoiding a conflict with a shutdown

 * overwriting a reopen.

 * port. Using a reopen avoids a conflict with a shutdown

 * overwriting a reopen. The "forced" ensures that a disappeared port

 * is not opened again as valid due to the cached plogi data in

 * non-NPIV mode.

 */

static void zfcp_scsi_terminate_rport_io(struct fc_rport *rport)

{
@@ -519,7 +521,7 @@ static void zfcp_scsi_terminate_rport_io(struct fc_rport *rport) 
	port = zfcp_get_port_by_wwpn(adapter, rport->port_name);



	if (port) {

		zfcp_erp_port_reopen(port, 0, "sctrpi1", NULL);

		zfcp_erp_port_forced_reopen(port, 0, "sctrpi1", NULL);

		put_device(&port->dev);

	}

}