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

Commit 0cd4bd47 authored by Stefan Haberland's avatar Stefan Haberland Committed by Martin Schwidefsky
Browse files

[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: default avatarStefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 50afd20f

drivers/s390/block/dasd.c

+4 −0
Original line number Diff line number Diff line
@@ -1898,15 +1898,19 @@ static int dasd_flush_block_queue(struct dasd_block *block) 
		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;

}