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

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

[SCSI] zfcp: Fix invalid command order 



We should not modify the port status after triggering an ERP action
for the port. It is not guaranteed which status is finally active
when the ERP action is performed. This can lead to situations which
are unwanted and hard to debug in case of a failure.

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 5381837f

drivers/s390/scsi/zfcp_fsf.c

+4 −3
Original line number Diff line number Diff line
@@ -1731,15 +1731,16 @@ static void zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *req) 
		zfcp_fsf_access_denied_port(req, port);

		break;

	case FSF_PORT_BOXED:

		zfcp_erp_port_boxed(port, "fscpph2", req);

		req->status |= ZFCP_STATUS_FSFREQ_ERROR |

			       ZFCP_STATUS_FSFREQ_RETRY;

		/* can't use generic zfcp_erp_modify_port_status because

		 * ZFCP_STATUS_COMMON_OPEN must not be reset for the port */

		atomic_clear_mask(ZFCP_STATUS_PORT_PHYS_OPEN, &port->status);

		list_for_each_entry(unit, &port->unit_list_head, list)

			atomic_clear_mask(ZFCP_STATUS_COMMON_OPEN,

					  &unit->status);

		zfcp_erp_port_boxed(port, "fscpph2", req);

		req->status |= ZFCP_STATUS_FSFREQ_ERROR |

			       ZFCP_STATUS_FSFREQ_RETRY;



		break;

	case FSF_ADAPTER_STATUS_AVAILABLE:

		switch (header->fsf_status_qual.word[0]) {