block: implement and enforce request peek/start/fetch

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

diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index 1ca5d14..c0cd0a0 100644 (file)
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -671,10 +671,8 @@ static void mg_request_poll(struct request_queue *q)
 
        while (1) {
                if (!host->req) {
-                       host->req = elv_next_request(q);
-                       if (host->req)
-                               blkdev_dequeue_request(host->req);
-                       else
+                       host->req = blk_fetch_request(q);
+                       if (!host->req)
                                break;
                }
 
@@ -744,10 +742,8 @@ static void mg_request(struct request_queue *q)
 
        while (1) {
                if (!host->req) {
-                       host->req = elv_next_request(q);
-                       if (host->req)
-                               blkdev_dequeue_request(host->req);
-                       else
+                       host->req = blk_fetch_request(q);
+                       if (!host->req)
                                break;
                }
                req = host->req;