block: implement and enforce request peek/start/fetch

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

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 89a591d..f5e7180 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1404,10 +1404,9 @@ static void redo_fd_request(void)
 
 repeat:
        if (!fd_request) {
-               fd_request = elv_next_request(floppy_queue);
+               fd_request = blk_fetch_request(floppy_queue);
                if (!fd_request)
                        goto the_end;
-               blkdev_dequeue_request(fd_request);
        }
 
        floppy = fd_request->rq_disk->private_data;