From 2661e076ec7451769bfdd2c6ab4c868afc4a443c Mon Sep 17 00:00:00 2001 From: Corrado Zoccolo Date: Thu, 26 Nov 2009 10:02:58 +0100 Subject: [PATCH] --- yaml --- r: 172974 b: refs/heads/master c: e4a229196a7c676514c78f6783f8994f64bf681c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f056b2545b72..4797cc3216f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e459dd08f45d2aa68abb0c02f8ab045cf8a598b8 +refs/heads/master: e4a229196a7c676514c78f6783f8994f64bf681c diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 47abd24617be..2c1086acddfa 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -2392,8 +2392,9 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq, if (cfq_class_idle(cfqq)) return true; - if (cfqd->serving_type == SYNC_NOIDLE_WORKLOAD - && new_cfqq->service_tree == cfqq->service_tree) + if (cfqd->serving_type == SYNC_NOIDLE_WORKLOAD && + cfqq_type(new_cfqq) == SYNC_NOIDLE_WORKLOAD && + new_cfqq->service_tree->count == 1) return true; /*