summaryrefslogtreecommitdiff
path: root/block/blk-mq-sched.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2023-05-18 08:31:00 +0300
committerJens Axboe <axboe@kernel.dk>2023-05-19 04:41:20 +0300
commitfdcab6cddef24a26b86d798814b3c25057e53c21 (patch)
tree50ae24bb898e0a20b25d388611c7563d25bd9988 /block/blk-mq-sched.h
parentd97217e7f024bbe9aa62aea070771234c2879358 (diff)
downloadlinux-fdcab6cddef24a26b86d798814b3c25057e53c21.tar.xz
blk-mq: remove RQF_ELVPRIV
RQF_ELVPRIV is set for all non-flush requests that have RQF_ELV set. Expand this condition in the two users of the flag and remove it. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Link: https://lore.kernel.org/r/20230518053101.760632-3-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq-sched.h')
-rw-r--r--block/blk-mq-sched.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h
index 7c3cbad17f30..4d8d2cd3b473 100644
--- a/block/blk-mq-sched.h
+++ b/block/blk-mq-sched.h
@@ -58,11 +58,11 @@ static inline void blk_mq_sched_completed_request(struct request *rq, u64 now)
static inline void blk_mq_sched_requeue_request(struct request *rq)
{
- if (rq->rq_flags & RQF_ELV) {
+ if ((rq->rq_flags & RQF_ELV) && !op_is_flush(rq->cmd_flags)) {
struct request_queue *q = rq->q;
struct elevator_queue *e = q->elevator;
- if ((rq->rq_flags & RQF_ELVPRIV) && e->type->ops.requeue_request)
+ if (e->type->ops.requeue_request)
e->type->ops.requeue_request(rq);
}
}