summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorStefan Haberland <stefan.haberland@de.ibm.com>2015-03-04 14:29:47 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-03-25 11:49:40 +0100
commita5fd8ddce2af98c7f8199d37a0b866e98f4c0de0 (patch)
tree780b8dbdad94233ec4f0a8fe74cbbc1e62fe6420 /drivers/s390
parente1d12d70f7467c3b26cbd0c14139dcddec88448d (diff)
downloadlinux-a5fd8ddce2af98c7f8199d37a0b866e98f4c0de0.tar.gz
linux-a5fd8ddce2af98c7f8199d37a0b866e98f4c0de0.tar.bz2
linux-a5fd8ddce2af98c7f8199d37a0b866e98f4c0de0.zip
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: Stefan Haberland <stefan.haberland@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/block/dasd.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 697a0b2158e6..26a51dc4278d 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -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;
}
/*