drivers/block/as-iosched.c | 10 ----------
1 files changed, 10 deletions(-)
diff -puN drivers/block/as-iosched.c~as-dont-clear-last_merge drivers/block/as-iosched.c
--- 25/drivers/block/as-iosched.c~as-dont-clear-last_merge 2003-05-22 12:31:11.000000000 -0700
+++ 25-akpm/drivers/block/as-iosched.c 2003-05-22 12:31:33.000000000 -0700
@@ -990,11 +990,6 @@ static void as_remove_queued_request(req
list_del_init(&arq->fifo);
as_del_arq_hash(arq);
as_del_arq_rb(ad, arq);
-
- if (q->last_merge == &rq->queuelist)
- q->last_merge = NULL;
-
- list_del_init(&rq->queuelist);
}
}
@@ -1007,11 +1002,6 @@ static void as_remove_dispatched_request
{
struct as_rq *arq = RQ_DATA(rq);
- if (q->last_merge == &rq->queuelist)
- q->last_merge = NULL;
-
- list_del_init(&rq->queuelist);
-
if (arq) {
struct as_io_context *aic;
_