Merge branch 'for-4.11/next' into for-4.11/linus-merge

Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 15 insertions, 14 deletions

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 1afab6558d0c..1372763a948f 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -659,23 +659,24 @@ static void gdrom_request(struct request_queue *rq)
         struct request *req;
 
         while ((req = blk_fetch_request(rq)) != NULL) {
-                if (req->cmd_type != REQ_TYPE_FS) {
-                        printk(KERN_DEBUG "gdrom: Non-fs request ignored\n");
-                        __blk_end_request_all(req, -EIO);
-                        continue;
-                }
-                if (rq_data_dir(req) != READ) {
+                switch (req_op(req)) {
+                case REQ_OP_READ:
+                        /*
+                         * Add to list of deferred work and then schedule
+                         * workqueue.
+                         */
+                        list_add_tail(&req->queuelist, &gdrom_deferred);
+                        schedule_work(&work);
+                        break;
+                case REQ_OP_WRITE:
                         pr_notice("Read only device - write request ignored\n");
                         __blk_end_request_all(req, -EIO);
-                        continue;
+                        break;
+                default:
+                        printk(KERN_DEBUG "gdrom: Non-fs request ignored\n");
+                        __blk_end_request_all(req, -EIO);
+                        break;
                 }
-
-                /*
-                 * Add to list of deferred work and then schedule
-                 * workqueue.
-                 */
-                list_add_tail(&req->queuelist, &gdrom_deferred);
-                schedule_work(&work);
         }
 }