diff options
| author |   Bart Van Assche <bart.vanassche@sandisk.com> | 2017-04-19 14:01:27 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2017-04-19 17:38:34 -0600 |
| commit | 0be0dee64eacd950f8e4b6c45adb5a92392eaaaf (patch) | |
| tree | 105bc37e66793b138dfb8471b347a8c069fc794d /block | |
| parent | lightnvm: Use blk_init_request_from_bio() instead of open-coding it (diff) | |
| download | linux-dev-0be0dee64eacd950f8e4b6c45adb5a92392eaaaf.tar.xz linux-dev-0be0dee64eacd950f8e4b6c45adb5a92392eaaaf.zip | |
block: Inline blk_rq_set_prio()
Since only a single caller remains, inline blk_rq_set_prio(). Initialize
req->ioprio even if no I/O priority has been set in the bio nor in the
I/O context.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Adam Manzanares <adam.manzanares@wdc.com>
Tested-by: Adam Manzanares <adam.manzanares@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 72544b462657..25aea293ee98 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1630,14 +1630,19 @@ out: void blk_init_request_from_bio(struct request *req, struct bio *bio) { + struct io_context *ioc = rq_ioc(bio); + if (bio->bi_opf & REQ_RAHEAD) req->cmd_flags |= REQ_FAILFAST_MASK; req->errors = 0; req->__sector = bio->bi_iter.bi_sector; - blk_rq_set_prio(req, rq_ioc(bio)); if (ioprio_valid(bio_prio(bio))) req->ioprio = bio_prio(bio); + else if (ioc) + req->ioprio = ioc->ioprio; + else + req->ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0); blk_rq_bio_prep(req->q, req, bio); } EXPORT_SYMBOL_GPL(blk_init_request_from_bio); |