block: split out request-only flags into a new namespace

A lot of the REQ_* flags are only used on struct requests, and only of
use to the block layer and a few drivers that dig into struct request
internals.

This patch adds a new req_flags_t rq_flags field to struct request for
them, and thus dramatically shrinks the number of common requests.  It
also removes the unfortunate situation where we have to fit the fields
from the same enum into 32 bits for struct bio and 64 bits for
struct request.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Shaun Tancheff <shaun.tancheff@seagate.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/block/blk-tag.c b/block/blk-tag.c
index f0344e6939d5..bae1decb6ec3 100644
--- a/block/blk-tag.c
+++ b/block/blk-tag.c
@@ -270,7 +270,7 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq)
         BUG_ON(tag >= bqt->real_max_depth);
 
         list_del_init(&rq->queuelist);
-        rq->cmd_flags &= ~REQ_QUEUED;
+        rq->rq_flags &= ~RQF_QUEUED;
         rq->tag = -1;
 
         if (unlikely(bqt->tag_index[tag] == NULL))
@@ -316,7 +316,7 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq)
         unsigned max_depth;
         int tag;
 
-        if (unlikely((rq->cmd_flags & REQ_QUEUED))) {
+        if (unlikely((rq->rq_flags & RQF_QUEUED))) {
                 printk(KERN_ERR
                        "%s: request %p for device [%s] already tagged %d",
                        __func__, rq,
@@ -371,7 +371,7 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq)
          */
 
         bqt->next_tag = (tag + 1) % bqt->max_depth;
-        rq->cmd_flags |= REQ_QUEUED;
+        rq->rq_flags |= RQF_QUEUED;
         rq->tag = tag;
         bqt->tag_index[tag] = rq;
         blk_start_request(rq);