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

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

[SCSI] zfcp: Reorder registration of initial SCSI device 



Make sure that the rport registration did complete and then register
SCSI device directly. Otherwise the unit_enqueue would race with the
call to zfcp_scsi_queue_unit_register.

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 634651fa

drivers/s390/scsi/zfcp_aux.c

+2 −1
Original line number Diff line number Diff line
@@ -73,13 +73,14 @@ static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun) 
	if (!port)

		goto out_port;



	flush_work(&port->rport_work);

	unit = zfcp_unit_enqueue(port, lun);

	if (IS_ERR(unit))

		goto out_unit;



	zfcp_erp_unit_reopen(unit, 0, "auidc_1", NULL);

	zfcp_erp_wait(adapter);

	flush_work(&unit->scsi_work);

	zfcp_scsi_scan(unit);



out_unit:

	put_device(&port->dev);