tree d716ae7dc2e986b36c8180333839312dc0eab7e2
parent f7c80c9f77b0e8a59a19506fd3caf323408a5166
author Jens Axboe <[EMAIL PROTECTED]> Tue, 02 Aug 2005 20:08:02 +0200
committer Linus Torvalds <[EMAIL PROTECTED]> Wed, 03 Aug 2005 01:19:18 -0700

[PATCH] cfq-iosched: fix problem with barriers and max_depth == 1

CFQ will currently stall when using write barriers and the default
max_depth setting of 1, since we artificially need a depth of 2 when
pre-pending the first flush. So never deny the barrier request going to
the device.

This is a regression since 2.6.12, it was found in SUSE testing.

Signed-off-by: Jens Axboe <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 drivers/block/cfq-iosched.c |    1 +
 1 files changed, 1 insertion(+)

diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
@@ -1281,6 +1281,7 @@ dispatch:
                         */
                        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;
 
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to