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

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

[SCSI] zfcp: Simplify ccw notify handler 



The notify handler does not change the list of adapters, it only
triggers erp actions to open or shutdown the adapter. We don't
need to hold the config semaphore and wait for the erp to complete.

This is a prerequisite for a fix in the s390 common i/o code.

Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarMartin Petermann <martin@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 47f7bba5

drivers/s390/scsi/zfcp_ccw.c

+1 −5
Original line number Diff line number Diff line
@@ -152,10 +152,8 @@ static int zfcp_ccw_set_offline(struct ccw_device *ccw_device) 
 */

static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)

{

	struct zfcp_adapter *adapter;

	struct zfcp_adapter *adapter = dev_get_drvdata(&ccw_device->dev);



	down(&zfcp_data.config_sema);

	adapter = dev_get_drvdata(&ccw_device->dev);

	switch (event) {

	case CIO_GONE:

		dev_warn(&adapter->ccw_device->dev, "device gone\n");
@@ -174,8 +172,6 @@ static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event) 
					89, NULL);

		break;

	}

	zfcp_erp_wait(adapter);

	up(&zfcp_data.config_sema);

	return 1;

}