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

Commit 097ef3bd authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Do not try "forced close" when port is already closed 



When the port is already "physically closed" try the reopen instead.
There is no way to send a "physically close" to an already closed
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 5767620c

drivers/s390/scsi/zfcp_erp.c

+5 −1
Original line number Diff line number Diff line
@@ -141,8 +141,12 @@ static int zfcp_erp_required_act(int want, struct zfcp_adapter *adapter, 
		if (!(p_status & ZFCP_STATUS_COMMON_UNBLOCKED))

			need = ZFCP_ERP_ACTION_REOPEN_PORT;

		/* fall through */

	case ZFCP_ERP_ACTION_REOPEN_PORT:

	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:

		p_status = atomic_read(&port->status);

		if (!(p_status & ZFCP_STATUS_COMMON_OPEN))

			need = ZFCP_ERP_ACTION_REOPEN_PORT;

		/* fall through */

	case ZFCP_ERP_ACTION_REOPEN_PORT:

		p_status = atomic_read(&port->status);

		if (p_status & ZFCP_STATUS_COMMON_ERP_INUSE)

			return 0;