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

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

s390/dasd: remove setting of scheduler from driver 



Remove the hard coded scheduler for the DASD device driver to enable
change of the scheduler during runtime. Set recommended deadline
scheduler via additional udev rule.

Signed-off-by: default avatarStefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent e1d12d70

drivers/s390/block/dasd.c

+1 −10
Original line number Diff line number Diff line
@@ -2965,8 +2965,6 @@ enum blk_eh_timer_return dasd_times_out(struct request *req) 
 */

static int dasd_alloc_queue(struct dasd_block *block)

{

	int rc;



	block->request_queue = blk_init_queue(do_dasd_request,

					       &block->request_queue_lock);

	if (block->request_queue == NULL)
@@ -2974,14 +2972,7 @@ static int dasd_alloc_queue(struct dasd_block *block) 


	block->request_queue->queuedata = 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)

		blk_cleanup_queue(block->request_queue);

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

	return rc;

	return 0;

}



/*