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

Commit 5767620c authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Do not unblock rport from REOPEN_PORT_FORCED 



When the REOPEN_PORT_FORCED erp action succeeds, the port has been
closed. A REOPEN_PORT will try to open the port after the
REPORT_PORT_FORCED. The rport should only be unblocked after the
successful completion of the reopen port.

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 478a8a05

drivers/s390/scsi/zfcp_erp.c

+2 −1
Original line number Diff line number Diff line
@@ -1197,10 +1197,11 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result) 
		put_device(&unit->dev);

		break;



	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:

	case ZFCP_ERP_ACTION_REOPEN_PORT:

		if (result == ZFCP_ERP_SUCCEEDED)

			zfcp_scsi_schedule_rport_register(port);

		/* fall through */

	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:

		put_device(&port->dev);

		break;