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

Commit ef089941 authored by Heiko Carstens's avatar Heiko Carstens Committed by Jens Axboe
Browse files

s390/dasd: hold request queue sysfs lock when calling elevator_init() 



"elevator: Fix a race in elevator switching and md device initialization"
changed the semantics of elevator_init() in a way that now enforces to hold
the corresponding request queue's sysfs_lock when calling elevator_init()
to fix a race.
The patch did not convert the s390 dasd device driver which is the only
device driver which also calls elevator_init(). So add the missing locking.

Cc: Tomoki Sekiyama <tomoki.sekiyama@hds.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b88fac63

drivers/s390/block/dasd.c

+4 −4
Original line number Diff line number Diff line
@@ -2978,13 +2978,13 @@ static int dasd_alloc_queue(struct dasd_block *block) 


	elevator_exit(block->request_queue->elevator);

	block->request_queue->elevator = NULL;

	mutex_lock(&block->request_queue->sysfs_lock);

	rc = elevator_init(block->request_queue, "deadline");

	if (rc) {

	if (rc)

		blk_cleanup_queue(block->request_queue);

	mutex_unlock(&block->request_queue->sysfs_lock);

	return rc;

}

	return 0;

}



/*

 * Allocate and initialize request queue.