From a467fa92f0aad123bd97422f5fc16f79cbf51e3a Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Fri, 16 Dec 2011 14:00:22 +0100 Subject: [PATCH] --- yaml --- r: 285119 b: refs/heads/master c: 4a0b75c7d02c2bd46ed227d4ba5941ba8a0aba5d h: refs/heads/master i: 285117: e95cc15b73828faa87866a9e81a2b3065de1bd55 285115: 5d98268165b5b981129394b9cc010c2ef5967a79 285111: e2319ed84d13908f7e924b9651d0d807aa33a06d 285103: ae2da987121faa5afcb9574e9b18f15f86b78d33 285087: 8f85c23d6dc236973d3ddd375492cb37837da360 285055: cb71898bd4cfb80c7b6a6bf5cd0a0c62c07748c5 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 80c2ba2b78fc..fe2bd1eb05b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1f8cc94651738b418ba54c039df536303b91704 +refs/heads/master: 4a0b75c7d02c2bd46ed227d4ba5941ba8a0aba5d diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index f3b44c394e6d..163263ddd381 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -1656,6 +1656,8 @@ cfq_merged_requests(struct request_queue *q, struct request *rq, struct request *next) { struct cfq_queue *cfqq = RQ_CFQQ(rq); + struct cfq_data *cfqd = q->elevator->elevator_data; + /* * reposition in fifo if next is older than rq */ @@ -1670,6 +1672,16 @@ cfq_merged_requests(struct request_queue *q, struct request *rq, cfq_remove_request(next); cfq_blkiocg_update_io_merged_stats(&(RQ_CFQG(rq))->blkg, rq_data_dir(next), rq_is_sync(next)); + + cfqq = RQ_CFQQ(next); + /* + * all requests of this queue are merged to other queues, delete it + * from the service tree. If it's the active_queue, + * cfq_dispatch_requests() will choose to expire it or do idle + */ + if (cfq_cfqq_on_rr(cfqq) && RB_EMPTY_ROOT(&cfqq->sort_list) && + cfqq != cfqd->active_queue) + cfq_del_cfqq_rr(cfqd, cfqq); } static int cfq_allow_merge(struct request_queue *q, struct request *rq,