summaryrefslogtreecommitdiffstats
path: root/block/blk-mq.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-05-31 19:11:39 +0200
committerJens Axboe <axboe@kernel.dk>2018-06-01 07:38:19 -0600
commitacddf3b308f6b6e23653de02e1abf98f402f1f12 (patch)
tree296aa44427ee604597d22412d212ae9744f7dd92 /block/blk-mq.c
parentddb7253254fee6922764043101f8b28b6a00595d (diff)
downloadlinux-acddf3b308f6b6e23653de02e1abf98f402f1f12.tar.gz
linux-acddf3b308f6b6e23653de02e1abf98f402f1f12.tar.bz2
linux-acddf3b308f6b6e23653de02e1abf98f402f1f12.zip
block: move sysfs_lock into elevator_init
Both callers take just around so function call, so move it in. Also remove the now pointless blk_mq_sched_init wrapper. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com> Tested-by: Damien Le Moal <damien.lemoal@wdc.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
-rw-r--r--block/blk-mq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 3d3952301b3e..858d6edff4d3 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2573,7 +2573,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
if (!(set->flags & BLK_MQ_F_NO_SCHED)) {
int ret;
- ret = blk_mq_sched_init(q);
+ ret = elevator_init(q);
if (ret)
return ERR_PTR(ret);
}