s390/dasd: remove setting of scheduler from driver
authorStefan Haberland <stefan.haberland@de.ibm.com>
Wed, 4 Mar 2015 13:29:47 +0000 (14:29 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Wed, 25 Mar 2015 10:49:40 +0000 (11:49 +0100)
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: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/block/dasd.c

index 697a0b2158e6e211c3c9e5a4d8be4bd9d57f89cc..26a51dc4278da64381889e51e50dfd638818018a 100644 (file)
@@ -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;
 }
 
 /*