[PATCH] Fix CFQ elevator problem

Remove bogus assert in CFQ and remove merge hints.

diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
index 11528978acf45b172d758422d64221af45549e80..977d32ddd97a4a0ebabe5ec87df58a924a4629e0 100644 (file)
--- 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;
        }