blk-mq: remove blk_mq_sched_{get,put}_rq_priv

[mirror_ubuntu-bionic-kernel.git] / block / blk-mq-sched.c

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 62db188595dc1ed090ded62f0ba6b0529add592b..22601e5c6f1982a67d6c70890fac3303682a8f7f 100644 (file)
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -36,6 +36,7 @@ static void __blk_mq_sched_assign_ioc(struct request_queue *q,
                                      struct bio *bio,
                                      struct io_context *ioc)
 {
+       struct elevator_queue *e = q->elevator;
        struct io_cq *icq;
 
        spin_lock_irq(q->queue_lock);
@@ -49,13 +50,14 @@ static void __blk_mq_sched_assign_ioc(struct request_queue *q,
        }
 
        rq->elv.icq = icq;
-       if (!blk_mq_sched_get_rq_priv(q, rq, bio)) {
-               rq->rq_flags |= RQF_ELVPRIV;
-               get_io_context(icq->ioc);
+       if (e && e->type->ops.mq.get_rq_priv &&
+           e->type->ops.mq.get_rq_priv(q, rq, bio)) {
+               rq->elv.icq = NULL;
                return;
        }
 
-       rq->elv.icq = NULL;
+       rq->rq_flags |= RQF_ELVPRIV;
+       get_io_context(icq->ioc);
 }
 
 void blk_mq_sched_assign_ioc(struct request_queue *q, struct request *rq,