---

yaml --- r: 5590 b: refs/heads/master c: d7ed538 h: refs/heads/master v: v3
git-mirror · Aug 2, 2005 · e1599e7 · e1599e7
1 parent 18e8485
commit e1599e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7c80c9f77b0e8a59a19506fd3caf323408a5166
+refs/heads/master: d7ed538a02c219119adb20f1dccbf0f8015e53f3
diff --git a/trunk/drivers/block/cfq-iosched.c b/trunk/drivers/block/cfq-iosched.c
@@ -1281,6 +1281,7 @@ static struct request *cfq_next_request(request_queue_t *q)
 			 */
 			if (!cfq_crq_in_driver(crq) &&
 			    !cfq_cfqq_idle_window(cfqq) &&
+			    !blk_barrier_rq(rq) &&
 			    cfqd->rq_in_driver >= cfqd->cfq_max_depth)
 				return NULL;