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

Commit 932f0549 authored by Stefan Haberland's avatar Stefan Haberland Committed by Martin Schwidefsky
Browse files

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

drivers/s390/block/dasd.c

+0 −3
Original line number Diff line number Diff line
@@ -1697,11 +1697,8 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, 
	if (cqr->status == DASD_CQR_CLEAR_PENDING &&

	    scsw_fctl(&irb->scsw) & SCSW_FCTL_CLEAR_FUNC) {

		cqr->status = DASD_CQR_CLEARED;

		if (cqr->callback_data == DASD_SLEEPON_START_TAG)

			cqr->callback_data = DASD_SLEEPON_END_TAG;

		dasd_device_clear_timer(device);

		wake_up(&dasd_flush_wq);

		wake_up(&generic_waitq);

		dasd_schedule_device_bh(device);

		return;

	}