2 files changed, 7 insertions, 16 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 7df03c7aea0..e64f62d5e0f 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1656,17 +1656,13 @@ static void __dasd_process_request_queue(struct dasd_block *block)
         if (basedev->state < DASD_STATE_READY)
                 return;
         /* Now we try to fetch requests from the request queue */
-        while (!blk_queue_plugged(queue) &&
-               elv_next_request(queue)) {
-
-                req = elv_next_request(queue);
-
+        while (!blk_queue_plugged(queue) && (req = blk_peek_request(queue))) {
                 if (basedev->features & DASD_FEATURE_READONLY &&
                     rq_data_dir(req) == WRITE) {
                         DBF_DEV_EVENT(DBF_ERR, basedev,
                                       "Rejecting write request %p",
                                       req);
-                        blkdev_dequeue_request(req);
+                        blk_start_request(req);
                         __blk_end_request_all(req, -EIO);
                         continue;
                 }
@@ -1695,7 +1691,7 @@ static void __dasd_process_request_queue(struct dasd_block *block)
                                       "CCW creation failed (rc=%ld) "
                                       "on request %p",
                                       PTR_ERR(cqr), req);
-                        blkdev_dequeue_request(req);
+                        blk_start_request(req);
                         __blk_end_request_all(req, -EIO);
                         continue;
                 }
@@ -1705,7 +1701,7 @@ static void __dasd_process_request_queue(struct dasd_block *block)
                  */
                 cqr->callback_data = (void *) req;
                 cqr->status = DASD_CQR_FILLED;
-                blkdev_dequeue_request(req);
+                blk_start_request(req);
                 list_add_tail(&cqr->blocklist, &block->ccw_queue);
                 dasd_profile_start(block, cqr, req);
         }
@@ -2029,10 +2025,8 @@ static void dasd_flush_request_queue(struct dasd_block *block)
                 return;
 
         spin_lock_irq(&block->request_queue_lock);
-        while ((req = elv_next_request(block->request_queue))) {
-                blkdev_dequeue_request(req);
+        while ((req = blk_fetch_request(block->request_queue)))
                 __blk_end_request_all(req, -EIO);
-        }
         spin_unlock_irq(&block->request_queue_lock);
 }
 
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 5d035e4939d..1e796767598 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -93,7 +93,7 @@ __tapeblock_end_request(struct tape_request *ccw_req, void *data)
                 device->blk_data.block_position = -1;
         device->discipline->free_bread(ccw_req);
         if (!list_empty(&device->req_queue) ||
-            elv_next_request(device->blk_data.request_queue))
+            blk_peek_request(device->blk_data.request_queue))
                 tapeblock_trigger_requeue(device);
 }
 
@@ -162,19 +162,16 @@ tapeblock_requeue(struct work_struct *work) {
         spin_lock_irq(&device->blk_data.request_queue_lock);
         while (
                 !blk_queue_plugged(queue) &&
-                elv_next_request(queue)   &&
+                (req = blk_fetch_request(queue)) &&
                 nr_queued < TAPEBLOCK_MIN_REQUEUE
         ) {
-                req = elv_next_request(queue);
                 if (rq_data_dir(req) == WRITE) {
                         DBF_EVENT(1, "TBLOCK: Rejecting write request\n");
-                        blkdev_dequeue_request(req);
                         spin_unlock_irq(&device->blk_data.request_queue_lock);
                         blk_end_request_all(req, -EIO);
                         spin_lock_irq(&device->blk_data.request_queue_lock);
                         continue;
                 }
-                blkdev_dequeue_request(req);
                 nr_queued++;
                 spin_unlock_irq(&device->blk_data.request_queue_lock);
                 rc = tapeblock_start_request(device, req);