From 82a03b714b959a1720f54ed4a1e2756afe4f169f Mon Sep 17 00:00:00 2001 From: Divyesh Shah Date: Thu, 25 Mar 2010 15:45:57 +0100 Subject: [PATCH] --- yaml --- r: 189731 b: refs/heads/master c: 39c01b219fd30c74869b6fc8749f7900f04e9ef6 h: refs/heads/master i: 189729: e8616deb92d7d650456205a944cf6bbaad94da85 189727: 8a5585b808bf21e9373e76d8665df3d2917872b8 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 981ab649a7a9..1acc50776f4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1ffe737f5b743115ee46ffb59e338e580c54902 +refs/heads/master: 39c01b219fd30c74869b6fc8749f7900f04e9ef6 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 2f91c5351949..2c7a0f4f3cd7 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -1723,6 +1723,8 @@ static struct cfq_queue *cfq_close_cooperator(struct cfq_data *cfqd, { struct cfq_queue *cfqq; + if (cfq_class_idle(cur_cfqq)) + return NULL; if (!cfq_cfqq_sync(cur_cfqq)) return NULL; if (CFQQ_SEEKY(cur_cfqq))