diff --git a/[refs] b/[refs] index 99d647dbeaa0..6dd502bd58b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcf4dd43424cdfd8195f3955300a579fe58e9911 +refs/heads/master: 1efe8fe1c2240acc476bed77740883df63373862 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index ee130f14d1fc..17b768d0d42f 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -1803,7 +1803,7 @@ static bool cfq_should_idle(struct cfq_data *cfqd, struct cfq_queue *cfqq) * Otherwise, we do only if they are the last ones * in their service tree. */ - return service_tree->count == 1; + return service_tree->count == 1 && cfq_cfqq_sync(cfqq); } static void cfq_arm_slice_timer(struct cfq_data *cfqd)