From 5d7b8e2c2dded5bf668ba559f0c2314c711d2f6c Mon Sep 17 00:00:00 2001 From: "Li, Shaohua" Date: Wed, 23 Mar 2011 08:30:34 +0100 Subject: [PATCH] --- yaml --- r: 242303 b: refs/heads/master c: c4ade94fc00f8b34589719d8a347f658b6d3951e h: refs/heads/master i: 242301: b20b789d09797257fed6df6c306b9fd50fca16fa 242299: f0ea02f03acec642819bfa3bce580beb65d14330 242295: 19fd935d56d26755ae82e09528ad6976fde215ea 242287: 7f6b53660c10925fd640e91a0e16dc2beb51c45e 242271: 066a1ca0da3fce9e0b900638cfc3c5dcd70427ff 242239: 7dab264f53ff7078c2cae9b3c2adb33158013e8b 242175: 039da57f2758b33536036a367841d25b55df1bdc v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 04e068dbdb9f..8099ad53db1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62a37f6badd1ac97ba07d543b5d4be2f9cb17217 +refs/heads/master: c4ade94fc00f8b34589719d8a347f658b6d3951e diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index fea1b5a9b7e9..7785169f3c8f 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -2417,19 +2417,14 @@ static bool cfq_may_dispatch(struct cfq_data *cfqd, struct cfq_queue *cfqq) return false; /* - * If there is only one sync queue, and its think time is - * small, we can ignore async queue here and give the sync + * If there is only one sync queue + * we can ignore async queue here and give the sync * queue no dispatch limit. The reason is a sync queue can * preempt async queue, limiting the sync queue doesn't make * sense. This is useful for aiostress test. */ - if (cfq_cfqq_sync(cfqq) && cfqd->busy_sync_queues == 1) { - struct cfq_io_context *cic = RQ_CIC(cfqq->next_rq); - - if (sample_valid(cic->ttime_samples) && - cic->ttime_mean < cfqd->cfq_slice_idle) - promote_sync = true; - } + if (cfq_cfqq_sync(cfqq) && cfqd->busy_sync_queues == 1) + promote_sync = true; /* * We have other queues, don't allow more IO from this one