diff options
| author | Stefan Haberland <stefan.haberland@de.ibm.com> | 2008-12-25 13:38:54 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 13:39:02 +0100 |
| commit | 0cd4bd4754d51bdc8f9cd880c29910d0d52337bb (patch) | |
| tree | 2f94085835c0a92a18c6520356fddc0875432707 /drivers/s390 | |
| parent | 50afd20f8c3ce23994a21c389e7250e54a93bf55 (diff) | |
| download | linux-0cd4bd4754d51bdc8f9cd880c29910d0d52337bb.tar.gz linux-0cd4bd4754d51bdc8f9cd880c29910d0d52337bb.tar.bz2 linux-0cd4bd4754d51bdc8f9cd880c29910d0d52337bb.zip | |
[S390] dasd: call cleanup_cqr with request_queue_lock
__dasd_cleanup_cqr should be called with request_queue_lock held and
__dasd_block_process_erp with queue_lock
Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/block/dasd.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 363bd1303d21..570ae59c1d5e 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -1898,15 +1898,19 @@ restart_cb: wait_event(dasd_flush_wq, (cqr->status < DASD_CQR_QUEUED)); /* Process finished ERP request. */ if (cqr->refers) { + spin_lock_bh(&block->queue_lock); __dasd_block_process_erp(block, cqr); + spin_unlock_bh(&block->queue_lock); /* restart list_for_xx loop since dasd_process_erp * might remove multiple elements */ goto restart_cb; } /* call the callback function */ + spin_lock_irq(&block->request_queue_lock); cqr->endclk = get_clock(); list_del_init(&cqr->blocklist); __dasd_cleanup_cqr(cqr); + spin_unlock_irq(&block->request_queue_lock); } return rc; } |