From 7503bd5505afab59c38146e76e3e7ea3f90b9769 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 3 Nov 2009 21:25:45 +0100 Subject: [PATCH] --- yaml --- r: 172931 b: refs/heads/master c: 125c4f221a5352ae08aef2898055b879ad963f01 h: refs/heads/master i: 172929: 18a187e26432b95fab217c0c55495fdc664822bd 172927: 98369684d1f7a327605c80f800bbcbaa257092fc v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2bb6cd43f569..f9b244124368 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2058297d2d045cb57138c33b87cfabcc80e65186 +refs/heads/master: 125c4f221a5352ae08aef2898055b879ad963f01 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 13b612f9f27a..b700f41cafb3 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -2433,7 +2433,6 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq, * if this request is as-good as one we would expect from the * current cfqq, let it preempt */ - if (cfq_rq_close(cfqd, cfqq, rq)) if (cfq_rq_close(cfqd, cfqq, rq) && (!cfq_cfqq_coop(new_cfqq) || cfqd->busy_queues == 1)) { /*