block: implement and enforce request peek/start/fetch

[safe/jmp/linux-2.6] / drivers / mtd / mtd_blkdevs.c

diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 3e10442..502622f 100644 (file)
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -100,12 +100,7 @@ static int mtd_blktrans_thread(void *arg)
                struct mtd_blktrans_dev *dev;
                int res;
 
-               if (!req) {
-                       req = elv_next_request(rq);
-                       if (req)
-                               blkdev_dequeue_request(req);
-               }
-               if (!req) {
+               if (!req && !(req = blk_fetch_request(rq))) {
                        set_current_state(TASK_INTERRUPTIBLE);
                        spin_unlock_irq(rq->queue_lock);
                        schedule();