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

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

[SCSI] zfcp: register with SCSI layer on ccw registration 



Synchronize the registration and de-registration with the SCSI layer
at CCW registration, de-registration. Before we registered with the
SCSI layer on adapter activation. This way the reg and de-reg process
is in balance.

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 27c3f0a6

drivers/s390/scsi/zfcp_aux.c

+2 −1
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device) 


	zfcp_fc_nameserver_init(adapter);



	if (!zfcp_adapter_scsi_register(adapter))

		return 0;



sysfs_failed:

drivers/s390/scsi/zfcp_ccw.c

+0 −6
Original line number Diff line number Diff line
@@ -106,10 +106,6 @@ static int zfcp_ccw_set_online(struct ccw_device *ccw_device) 
	if (retval)

		goto out;



	retval = zfcp_adapter_scsi_register(adapter);

	if (retval)

		goto out_scsi_register;



	/* initialize request counter */

	BUG_ON(!zfcp_reqlist_isempty(adapter));

	adapter->req_no = 0;
@@ -123,8 +119,6 @@ static int zfcp_ccw_set_online(struct ccw_device *ccw_device) 
	flush_work(&adapter->scan_work);

	return 0;



 out_scsi_register:

	zfcp_erp_thread_kill(adapter);

 out:

	up(&zfcp_data.config_sema);

	return retval;