block: fold cmd_type into the REQ_OP_ space

Instead of keeping two levels of indirection for requests types, fold it
all into the operations.  The little caveat here is that previously
cmd_type only applied to struct request, while the request and bio op
fields were set to plain REQ_OP_READ/WRITE even for passthrough
operations.

Instead this patch adds new REQ_OP_* for SCSI passthrough and driver
private requests, althought it has to add two for each so that we
can communicate the data in/out nature of the request.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

2 files changed, 16 insertions, 15 deletions

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 36f5237a8a69..8f496b4f3dd1 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2191,7 +2191,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
 
                 len = nr * CD_FRAMESIZE_RAW;
 
-                rq = blk_get_request(q, READ, GFP_KERNEL);
+                rq = blk_get_request(q, REQ_OP_SCSI_IN, GFP_KERNEL);
                 if (IS_ERR(rq)) {
                         ret = PTR_ERR(rq);
                         break;
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 584bc3126403..b6f1a5d95bc5 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);
         }
 }