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

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

[SCSI] zfcp: Changed D_ID left port disabled 



If the destination ID (D_ID) of a remote storage port changed, e.g.
re-plugged cable on the switch in a different switch port, the port
was never (re-)attached within Linux. This patch fixes the broken
mapping between the WWPN and the D_ID.

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 a17c5855

drivers/s390/scsi/zfcp_erp.c

+6 −1
Original line number Diff line number Diff line
@@ -895,8 +895,13 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act) 
				act->step = ZFCP_ERP_STEP_PORT_CLOSING;

				return ZFCP_ERP_CONTINUES;

			}

		/* fall through otherwise */

		}

		if (port->d_id && !(p_status & ZFCP_STATUS_COMMON_NOESC)) {

			port->d_id = 0;

			_zfcp_erp_port_reopen(port, 0, "erpsoc1", NULL);

			return ZFCP_ERP_EXIT;

		}

		/* fall through otherwise */

	}

	return ZFCP_ERP_FAILED;

}

drivers/s390/scsi/zfcp_fc.c

+6 −1
Original line number Diff line number Diff line
@@ -150,9 +150,14 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, 
	struct zfcp_port *port;



	read_lock_irqsave(&zfcp_data.config_lock, flags);

	list_for_each_entry(port, &fsf_req->adapter->port_list_head, list)

	list_for_each_entry(port, &fsf_req->adapter->port_list_head, list) {

		if ((port->d_id & range) == (elem->nport_did & range))

			zfcp_test_link(port);

		if (!port->d_id)

			zfcp_erp_port_reopen(port,

					     ZFCP_STATUS_COMMON_ERP_FAILED,

					     "fcrscn1", NULL);

	}



	read_unlock_irqrestore(&zfcp_data.config_lock, flags);

}