block, bfq: let a queue be merged only shortly after starting I/O

[mirror_ubuntu-eoan-kernel.git] / block / bfq-wf2q.c

diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
index e495d3f9b4b0a4a1c30375158755472260494597..4456eda34e483ec7745e8157acdad085ec45b5fd 100644 (file)
--- a/block/bfq-wf2q.c
+++ b/block/bfq-wf2q.c
@@ -835,6 +835,10 @@ void bfq_bfqq_served(struct bfq_queue *bfqq, int served)
        struct bfq_entity *entity = &bfqq->entity;
        struct bfq_service_tree *st;
 
+       if (!bfqq->service_from_backlogged)
+               bfqq->first_IO_time = jiffies;
+
+       bfqq->service_from_backlogged += served;
        for_each_entity(entity) {
                st = bfq_entity_service_tree(entity);