[patch] elv_former_request reversion

[Andrew Morton <akpm@digeo.com>]

This morning's fix for elv_former_request() is causing oopses all over the
place in the IO scheduler.

Jens, remember that I did try that fix a while ago, and the same happened.

I believe it has exposed a new problem at the __make_request/attempt_front_merge
level: if attempt_front_merge() actually succeeds, the wrong request gets freed
up in elv_merged_request().

It may be best to back this change out until it can be fixed up for real.


diff -puN drivers/block/elevator.c~deadline-hack drivers/block/elevator.c
--- 25/drivers/block/elevator.c~deadline-hack	2003-02-15 15:56:56.000000000 -0800
+++ 25-akpm/drivers/block/elevator.c	2003-02-15 15:57:09.000000000 -0800
@@ -399,7 +399,7 @@ struct request *elv_former_request(reque
 	elevator_t *e = &q->elevator;
 
 	if (e->elevator_former_req_fn)
-		return e->elevator_former_req_fn(q, rq);
+		return e->elevator_latter_req_fn(q, rq);
 
 	prev = rq->queuelist.prev;
 	if (prev != &q->queue_head && prev != &rq->queuelist)

_