diff options
| author | Stefan Haberland <stefan.haberland@de.ibm.com> | 2014-11-24 04:59:44 -0500 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2014-11-28 03:47:36 -0500 |
| commit | 932f0549f872cde022eed200910ee3291b1d3c69 (patch) | |
| tree | 0dcb57d16b8fcb88a1af654cad25fa3da364abc7 /drivers/s390/block | |
| parent | 2c17124bf33f0d9450375610ff79ad83531b5bfe (diff) | |
s390/dasd: fix list corruption for sleep_on requests
Fix race for sleep_on requests leading to list corruption.
The SLEEP_ON_END_TAG is set during CQR clean up. Remove it from
interrupt handler to avoid the CQR from being cleared when it is
still in the device_queue.
Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/block')
| -rw-r--r-- | drivers/s390/block/dasd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 8cb120e9c868..4abf11965484 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c | |||
| @@ -1697,11 +1697,8 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, | |||
| 1697 | if (cqr->status == DASD_CQR_CLEAR_PENDING && | 1697 | if (cqr->status == DASD_CQR_CLEAR_PENDING && |
| 1698 | scsw_fctl(&irb->scsw) & SCSW_FCTL_CLEAR_FUNC) { | 1698 | scsw_fctl(&irb->scsw) & SCSW_FCTL_CLEAR_FUNC) { |
| 1699 | cqr->status = DASD_CQR_CLEARED; | 1699 | cqr->status = DASD_CQR_CLEARED; |
| 1700 | if (cqr->callback_data == DASD_SLEEPON_START_TAG) | ||
| 1701 | cqr->callback_data = DASD_SLEEPON_END_TAG; | ||
| 1702 | dasd_device_clear_timer(device); | 1700 | dasd_device_clear_timer(device); |
| 1703 | wake_up(&dasd_flush_wq); | 1701 | wake_up(&dasd_flush_wq); |
| 1704 | wake_up(&generic_waitq); | ||
| 1705 | dasd_schedule_device_bh(device); | 1702 | dasd_schedule_device_bh(device); |
| 1706 | return; | 1703 | return; |
| 1707 | } | 1704 | } |
