From f260d7d82d4357395ee3943974308b33fd71634b Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Thu, 10 Dec 2009 19:25:41 +0100 Subject: [PATCH] --- yaml --- r: 176500 b: refs/heads/master c: 82bbbf28db4beefcd8b897800153e21378270cd1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a70d6aaf346e..9d2dabcf744d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 554554f60ad619e1efab01897208bc320b81d9da +refs/heads/master: 82bbbf28db4beefcd8b897800153e21378270cd1 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 96f59ae5b6e9..f3f62394b986 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -2151,10 +2151,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; }