block: implement and enforce request peek/start/fetch

[mirror_ubuntu-bionic-kernel.git] / drivers / block / swim3.c

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index f48c6dd47e04d1910a3f74b85997e3e6089917a3..80df93e3cdd05f0d9c219b6d18bbf8b7a6de517d 100644 (file)
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -326,10 +326,9 @@ static void start_request(struct floppy_state *fs)
        }
        while (fs->state == idle) {
                if (!fd_req) {
-                       fd_req = elv_next_request(swim3_queue);
+                       fd_req = blk_fetch_request(swim3_queue);
                        if (!fd_req)
                                break;
-                       blkdev_dequeue_request(fd_req);
                }
                req = fd_req;
 #if 0