Merge branch 'misc' into for-linus

[mirror_ubuntu-bionic-kernel.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index bd642a43b98b13fa95911677c60e4465e15d59e9..61ba08c58b649b54fdfbc4e06c7e1b11b015512a 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1154,6 +1154,7 @@ static struct request *__get_request(struct request_list *rl, unsigned int op,
 
        blk_rq_init(q, rq);
        blk_rq_set_rl(rq, rl);
+       blk_rq_set_prio(rq, ioc);
        rq->cmd_flags = op;
        rq->rq_flags = rq_flags;
 
@@ -1626,7 +1627,8 @@ void init_request_from_bio(struct request *req, struct bio *bio)
 
        req->errors = 0;
        req->__sector = bio->bi_iter.bi_sector;
-       req->ioprio = bio_prio(bio);
+       if (ioprio_valid(bio_prio(bio)))
+               req->ioprio = bio_prio(bio);
        blk_rq_bio_prep(req->q, req, bio);
 }