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>

7 files changed, 24 insertions, 36 deletions

diff --git a/block/bio.c b/block/bio.c
index 2b375020fc49..9a2dd7145e83 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1227,9 +1227,6 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
         if (!bio)
                 goto out_bmd;
 
-        if (iter->type & WRITE)
-                bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
-
         ret = 0;
 
         if (map_data) {
@@ -1394,12 +1391,6 @@ struct bio *bio_map_user_iov(struct request_queue *q,
 
         kfree(pages);
 
-        /*
-         * set data direction, and check if mapped pages need bouncing
-         */
-        if (iter->type & WRITE)
-                bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
-
         bio_set_flag(bio, BIO_USER_MAPPED);
 
         /*
@@ -1590,7 +1581,6 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,
                 bio->bi_private = data;
         } else {
                 bio->bi_end_io = bio_copy_kern_endio;
-                bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
         }
 
         return bio;
diff --git a/block/blk-core.c b/block/blk-core.c
index 44431086e4e7..3266daaa343f 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -158,8 +158,8 @@ static void req_bio_endio(struct request *rq, struct bio *bio,
 
 void blk_dump_rq_flags(struct request *rq, char *msg)
 {
-        printk(KERN_INFO "%s: dev %s: type=%x, flags=%llx\n", msg,
-                rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->cmd_type,
+        printk(KERN_INFO "%s: dev %s: flags=%llx\n", msg,
+                rq->rq_disk ? rq->rq_disk->disk_name : "?",
                 (unsigned long long) rq->cmd_flags);
 
         printk(KERN_INFO "  sector %llu, nr/cnr %u/%u\n",
@@ -1593,7 +1593,6 @@ out:
 
 void init_request_from_bio(struct request *req, struct bio *bio)
 {
-        req->cmd_type = REQ_TYPE_FS;
         if (bio->bi_opf & REQ_RAHEAD)
                 req->cmd_flags |= REQ_FAILFAST_MASK;
 
@@ -2983,7 +2982,6 @@ EXPORT_SYMBOL_GPL(blk_rq_unprep_clone);
 static void __blk_rq_prep_clone(struct request *dst, struct request *src)
 {
         dst->cpu = src->cpu;
-        dst->cmd_type = src->cmd_type;
         dst->__sector = blk_rq_pos(src);
         dst->__data_len = blk_rq_bytes(src);
         dst->nr_phys_segments = src->nr_phys_segments;
diff --git a/block/blk-flush.c b/block/blk-flush.c
index 0a0358e48b76..968162579234 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -327,7 +327,6 @@ static bool blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq)
                 blk_mq_tag_set_rq(hctx, first_rq->tag, flush_rq);
         }
 
-        flush_rq->cmd_type = REQ_TYPE_FS;
         flush_rq->cmd_flags = REQ_OP_FLUSH | REQ_PREFLUSH;
         flush_rq->rq_flags |= RQF_FLUSH_SEQ;
         flush_rq->rq_disk = first_rq->rq_disk;
diff --git a/block/blk-map.c b/block/blk-map.c
index 0acb6640ead7..2f18c2a0be1b 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -16,8 +16,6 @@
 int blk_rq_append_bio(struct request *rq, struct bio *bio)
 {
         if (!rq->bio) {
-                rq->cmd_flags &= REQ_OP_MASK;
-                rq->cmd_flags |= (bio->bi_opf & REQ_OP_MASK);
                 blk_rq_bio_prep(rq->q, rq, bio);
         } else {
                 if (!ll_back_merge_fn(rq->q, rq, bio))
@@ -62,6 +60,9 @@ static int __blk_rq_map_user_iov(struct request *rq,
         if (IS_ERR(bio))
                 return PTR_ERR(bio);
 
+        bio->bi_opf &= ~REQ_OP_MASK;
+        bio->bi_opf |= req_op(rq);
+
         if (map_data && map_data->null_mapped)
                 bio_set_flag(bio, BIO_NULL_MAPPED);
 
@@ -90,7 +91,7 @@ static int __blk_rq_map_user_iov(struct request *rq,
 }
 
 /**
- * blk_rq_map_user_iov - map user data to a request, for REQ_TYPE_BLOCK_PC usage
+ * blk_rq_map_user_iov - map user data to a request, for passthrough requests
  * @q:          request queue where request should be inserted
  * @rq:         request to map data to
  * @map_data:   pointer to the rq_map_data holding pages (if necessary)
@@ -199,7 +200,7 @@ int blk_rq_unmap_user(struct bio *bio)
 EXPORT_SYMBOL(blk_rq_unmap_user);
 
 /**
- * blk_rq_map_kern - map kernel data to a request, for REQ_TYPE_BLOCK_PC usage
+ * blk_rq_map_kern - map kernel data to a request, for passthrough requests
  * @q:          request queue where request should be inserted
  * @rq:         request to fill
  * @kbuf:       the kernel buffer
@@ -234,8 +235,8 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
         if (IS_ERR(bio))
                 return PTR_ERR(bio);
 
-        if (!reading)
-                bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
+        bio->bi_opf &= ~REQ_OP_MASK;
+        bio->bi_opf |= req_op(rq);
 
         if (do_copy)
                 rq->rq_flags |= RQF_COPY_USER;
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index 5cd2b435a9f5..1e2a4a2ff623 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -88,8 +88,8 @@ static int blk_mq_debugfs_rq_show(struct seq_file *m, void *v)
 {
         struct request *rq = list_entry_rq(v);
 
-        seq_printf(m, "%p {.cmd_type=%u, .cmd_flags=0x%x, .rq_flags=0x%x, .tag=%d, .internal_tag=%d}\n",
-                   rq, rq->cmd_type, rq->cmd_flags, (unsigned int)rq->rq_flags,
+        seq_printf(m, "%p {.cmd_flags=0x%x, .rq_flags=0x%x, .tag=%d, .internal_tag=%d}\n",
+                   rq, rq->cmd_flags, (unsigned int)rq->rq_flags,
                    rq->tag, rq->internal_tag);
         return 0;
 }
diff --git a/block/bsg.c b/block/bsg.c
index e34c3320956c..a9a8b8e0446f 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -177,7 +177,7 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
  * Check if sg_io_v4 from user is allowed and valid
  */
 static int
-bsg_validate_sgv4_hdr(struct sg_io_v4 *hdr, int *rw)
+bsg_validate_sgv4_hdr(struct sg_io_v4 *hdr, int *op)
 {
         int ret = 0;
 
@@ -198,7 +198,7 @@ bsg_validate_sgv4_hdr(struct sg_io_v4 *hdr, int *rw)
                 ret = -EINVAL;
         }
 
-        *rw = hdr->dout_xfer_len ? WRITE : READ;
+        *op = hdr->dout_xfer_len ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN;
         return ret;
 }
 
@@ -210,8 +210,8 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm)
 {
         struct request_queue *q = bd->queue;
         struct request *rq, *next_rq = NULL;
-        int ret, rw;
-        unsigned int dxfer_len;
+        int ret;
+        unsigned int op, dxfer_len;
         void __user *dxferp = NULL;
         struct bsg_class_device *bcd = &q->bsg_dev;
 
@@ -226,14 +226,14 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm)
                 hdr->dout_xfer_len, (unsigned long long) hdr->din_xferp,
                 hdr->din_xfer_len);
 
-        ret = bsg_validate_sgv4_hdr(hdr, &rw);
+        ret = bsg_validate_sgv4_hdr(hdr, &op);
         if (ret)
                 return ERR_PTR(ret);
 
         /*
          * map scatter-gather elements separately and string them to request
          */
-        rq = blk_get_request(q, rw, GFP_KERNEL);
+        rq = blk_get_request(q, op, GFP_KERNEL);
         if (IS_ERR(rq))
                 return rq;
         scsi_req_init(rq);
@@ -242,20 +242,19 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm)
         if (ret)
                 goto out;
 
-        if (rw == WRITE && hdr->din_xfer_len) {
+        if (op == REQ_OP_SCSI_OUT && hdr->din_xfer_len) {
                 if (!test_bit(QUEUE_FLAG_BIDI, &q->queue_flags)) {
                         ret = -EOPNOTSUPP;
                         goto out;
                 }
 
-                next_rq = blk_get_request(q, READ, GFP_KERNEL);
+                next_rq = blk_get_request(q, REQ_OP_SCSI_IN, GFP_KERNEL);
                 if (IS_ERR(next_rq)) {
                         ret = PTR_ERR(next_rq);
                         next_rq = NULL;
                         goto out;
                 }
                 rq->next_rq = next_rq;
-                next_rq->cmd_type = rq->cmd_type;
 
                 dxferp = (void __user *)(unsigned long)hdr->din_xferp;
                 ret =  blk_rq_map_user(q, next_rq, NULL, dxferp,
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 7edf44f25e08..2a2fc768b27a 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -321,7 +321,8 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
                 at_head = 1;
 
         ret = -ENOMEM;
-        rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);
+        rq = blk_get_request(q, writing ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN,
+                        GFP_KERNEL);
         if (IS_ERR(rq))
                 return PTR_ERR(rq);
         req = scsi_req(rq);
@@ -448,7 +449,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
 
         }
 
-        rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_RECLAIM);
+        rq = blk_get_request(q, in_len ? REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN,
+                        __GFP_RECLAIM);
         if (IS_ERR(rq)) {
                 err = PTR_ERR(rq);
                 goto error_free_buffer;
@@ -537,7 +539,7 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk,
         struct request *rq;
         int err;
 
-        rq = blk_get_request(q, WRITE, __GFP_RECLAIM);
+        rq = blk_get_request(q, REQ_OP_SCSI_OUT, __GFP_RECLAIM);
         if (IS_ERR(rq))
                 return PTR_ERR(rq);
         scsi_req_init(rq);
@@ -745,7 +747,6 @@ void scsi_req_init(struct request *rq)
 {
         struct scsi_request *req = scsi_req(rq);
 
-        rq->cmd_type = REQ_TYPE_BLOCK_PC;
         memset(req->__cmd, 0, sizeof(req->__cmd));
         req->cmd = req->__cmd;
         req->cmd_len = BLK_MAX_CDB;