cfq: set workload as expired if it doesn't have any slice left

[net-next-2.6.git] / block / cfq-iosched.c

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 69ecee7f4ad47b8b0f2a9c80bf66a7524130eef9..e2f80463ed0d621df96bef311543f714462d7f7d 100644 (file)
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2113,7 +2113,9 @@ static void cfq_choose_cfqg(struct cfq_data *cfqd)
                cfqd->workload_expires = jiffies + cfqg->saved_workload_slice;
                cfqd->serving_type = cfqg->saved_workload;
                cfqd->serving_prio = cfqg->saved_serving_prio;
-       }
+       } else
+               cfqd->workload_expires = jiffies - 1;
+
        choose_service_tree(cfqd, cfqg);
 }
 
@@ -2151,10 +2153,11 @@ static struct cfq_queue *cfq_select_queue(struct cfq_data *cfqd)
                 * have been idling all along on this queue and it should be
                 * ok to wait for this request to complete.
                 */
-               if (cfqq->cfqg->nr_cfqq == 1 && cfqq->dispatched
-                   && cfq_should_idle(cfqd, cfqq))
+               if (cfqq->cfqg->nr_cfqq == 1 && RB_EMPTY_ROOT(&cfqq->sort_list)
+                   && cfqq->dispatched && cfq_should_idle(cfqd, cfqq)) {
+                       cfqq = NULL;
                        goto keep_queue;
-               else
+               } else
                        goto expire;
        }
 
@@ -3202,6 +3205,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
                        if (blk_rq_bytes(rq) > PAGE_CACHE_SIZE ||
                            cfqd->busy_queues > 1) {
                                del_timer(&cfqd->idle_slice_timer);
+                               cfq_clear_cfqq_wait_request(cfqq);
                                __blk_run_queue(cfqd->queue);
                        } else
                                cfq_mark_cfqq_must_dispatch(cfqq);