Merge tag 'block-5.18-2022-05-18' of git://git.kernel.dk/linux-block

f993aed4 · Linus Torvalds <[email protected]> · 2022-05-18 14:32:27 -10:00

Pull block fix from Jens Axboe:
 "Just a small fix for a missing fifo time assigment for the head
  insertion case in mq-deadline"

* tag 'block-5.18-2022-05-18' of git://git.kernel.dk/linux-block:
  block/mq-deadline: Set the fifo_time member also if inserting at head

Commit: f993aed406eaf968ba3867a76bb46c95336a33d0
Parents: 01464a73 · 725f22a1

Merge commit. Changes below are compared with the first parent: 01464a73.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
block/mq-deadline.c	modified	+1	−0	View file

block/mq-deadline.c

View file

diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index 3ed5eaf..6ed602b 100644
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -742,6 +742,7 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
 
 	if (at_head) {
 		list_add(&rq->queuelist, &per_prio->dispatch);
+		rq->fifo_time = jiffies;
 	} else {
 		deadline_add_rq_rb(per_prio, rq);
 