From c09d1da3262ef78dc0f53ad8ff7d26a90ac962a8 Mon Sep 17 00:00:00 2001 From: Gui Jianfeng Date: Tue, 8 Dec 2009 08:54:17 +0100 Subject: [PATCH] --- yaml --- r: 176495 b: refs/heads/master c: b9d8f4c73b1af4cfd53f819bf84c2bce31232275 h: refs/heads/master i: 176493: 5eabd7b31ee34655bac02effb8ade6a77c1caf37 176491: 3c9a409ddbcbf9f76aa6c3c568340effbaa07c95 176487: 7b1176cb1aac183777a1882be3760cf5d1f98780 176479: 8757764032825953a43f87dc8fb8d9f87716217c v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6d4adfd0daba..a7b0281a1bd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3b8d92d25212c5b6534ae9b347ed2858de78336 +refs/heads/master: b9d8f4c73b1af4cfd53f819bf84c2bce31232275 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 5009af490a0c..b19cd684bf12 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -1749,6 +1749,12 @@ static struct cfq_queue *cfq_close_cooperator(struct cfq_data *cfqd, if (CFQQ_SEEKY(cur_cfqq)) return NULL; + /* + * Don't search priority tree if it's the only queue in the group. + */ + if (cur_cfqq->cfqg->nr_cfqq == 1) + return NULL; + /* * We should notice if some of the queues are cooperating, eg * working closely on the same area of the disk. In that case,