block: implement and enforce request peek/start/fetch

[safe/jmp/linux-2.6] / drivers / block / paride / pf.c

diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index d6f7bd8..68a9083 100644 (file)
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -762,10 +762,9 @@ static void do_pf_request(struct request_queue * q)
                return;
 repeat:
        if (!pf_req) {
-               pf_req = elv_next_request(q);
+               pf_req = blk_fetch_request(q);
                if (!pf_req)
                        return;
-               blkdev_dequeue_request(pf_req);
        }
 
        pf_current = pf_req->rq_disk->private_data;