diff options
| author |   Christof Schmitt <christof.schmitt@de.ibm.com> | 2008-08-21 13:43:34 +0200 |
|---|---|---|
| committer |   James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-08-29 09:04:13 -0500 |
| commit | f48bf7fb00f74d93105ba69522a3f6c9435d6af3 (patch) | |
| tree | 291ff489bd21474114633f255228b5361e269ed7 | |
| parent | [SCSI] zfcp: Correctly query end flag in gpn_ft response (diff) | |
| download | linux-dev-f48bf7fb00f74d93105ba69522a3f6c9435d6af3.tar.xz linux-dev-f48bf7fb00f74d93105ba69522a3f6c9435d6af3.zip | |
[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: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: Martin Petermann <martin@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | drivers/s390/scsi/zfcp_ccw.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c index 391dd29749f8..51b6a05f4d12 100644 --- a/drivers/s390/scsi/zfcp_ccw.c +++ b/drivers/s390/scsi/zfcp_ccw.c @@ -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; } |