---

yaml
---
r: 242303
b: refs/heads/master
c: c4ade94
h: refs/heads/master
i:
  242301: b20b789
  242299: f0ea02f
  242295: 19fd935
  242287: 7f6b536
  242271: 066a1ca
  242239: 7dab264
  242175: 039da57
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62a37f6badd1ac97ba07d543b5d4be2f9cb17217
+refs/heads/master: c4ade94fc00f8b34589719d8a347f658b6d3951e

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