From e1599e7742145cd1395c7103e47a77a7ddfc5fba Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Tue, 2 Aug 2005 20:08:02 +0200
Subject: [PATCH] --- yaml --- r: 5590 b: refs/heads/master c:
 d7ed538a02c219119adb20f1dccbf0f8015e53f3 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/block/cfq-iosched.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b0397eb45173..36e0ddf996da 100644
--- 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
index de5746e38af9..2435a7c99b2b 100644
--- 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;