diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-10-20 15:12:13 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-10-28 16:45:17 +0200 |
| commit | e806402130c9c494e22c73ae9ead4e79d2a5811c (patch) | |
| tree | bac59e1eb3f1b5945409bd0780a4824e9b8383f8 /block/blk-map.c | |
| parent | block: replace REQ_THROTTLED with a bio flag (diff) | |
| download | linux-e806402130c9c494e22c73ae9ead4e79d2a5811c.tar.xz linux-e806402130c9c494e22c73ae9ead4e79d2a5811c.zip | |
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>
Diffstat (limited to 'block/blk-map.c')
| -rw-r--r-- | block/blk-map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-map.c b/block/blk-map.c index b8657fa8dc9a..2c5ae5fef473 100644 --- a/block/blk-map.c +++ b/block/blk-map.c @@ -135,7 +135,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, } while (iov_iter_count(&i)); if (!bio_flagged(bio, BIO_USER_MAPPED)) - rq->cmd_flags |= REQ_COPY_USER; + rq->rq_flags |= RQF_COPY_USER; return 0; unmap_rq: @@ -232,7 +232,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, bio_set_op_attrs(bio, REQ_OP_WRITE, 0); if (do_copy) - rq->cmd_flags |= REQ_COPY_USER; + rq->rq_flags |= RQF_COPY_USER; ret = blk_rq_append_bio(rq, bio); if (unlikely(ret)) { |