block: replace end_request() with [__]blk_end_request_cur()

[mirror_ubuntu-artful-kernel.git] / drivers / cdrom / gdrom.c

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index fee9a9e83fc944c28b3fbe300e38ef9c406d6ca9..cab2b1fb2fe7a53766ae6f007f68ac8730922e4d 100644 (file)
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -654,17 +654,17 @@ static void gdrom_request(struct request_queue *rq)
        while ((req = elv_next_request(rq)) != NULL) {
                if (!blk_fs_request(req)) {
                        printk(KERN_DEBUG "GDROM: Non-fs request ignored\n");
-                       end_request(req, 0);
+                       __blk_end_request_cur(req, -EIO);
                }
                if (rq_data_dir(req) != READ) {
                        printk(KERN_NOTICE "GDROM: Read only device -");
                        printk(" write request ignored\n");
-                       end_request(req, 0);
+                       __blk_end_request_cur(req, -EIO);
                }
                if (req->nr_sectors)
                        gdrom_request_handler_dma(req);
                else
-                       end_request(req, 0);
+                       __blk_end_request_cur(req, -EIO);
        }
 }