diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-09 15:13:05 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-09 15:13:05 +1100 |
commit | 0d0446cc20f9117bba0b1dcb66b6418bf0e8cb62 (patch) | |
tree | cf37a532a84ac450b8155ca707830639a716b42a /block | |
parent | 5f3dd186346b38e071f632c8abef896fb2e14592 (diff) | |
parent | 81cdffc2a408b944cd90050c27048e91af5e1d2f (diff) |
Merge remote-tracking branch 'libata/for-next'
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 4b7ec5958055..1998aa411615 100644 --- 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; @@ -1658,7 +1659,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); } |