Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2004-04-19 18:02:57 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-04-19 18:02:57 -0700
commit28f9542583e4e7408eda53c45aecf7b8c827fac8 (patch)
treefe2459167047aa920b9c54baf7cde610521cdf3d
parent70e2d422332806f48d95b02716b019d9dfe2ef43 (diff)
[PATCH] Fix CFQ elevator problem
Remove bogus assert in CFQ and remove merge hints.
-rw-r--r--drivers/block/cfq-iosched.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
index 11528978acf4..977d32ddd97a 100644
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
@@ -401,10 +401,9 @@ static struct request *cfq_next_request(request_queue_t *q)
dispatch:
rq = list_entry_rq(cfqd->dispatch->next);
- BUG_ON(q->last_merge == rq);
crq = RQ_DATA(rq);
if (crq)
- BUG_ON(ON_MHASH(crq));
+ cfq_remove_merge_hints(q, crq);
return rq;
}