diff options
| author | Jens Axboe <axboe@fb.com> | 2017-02-18 00:08:19 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-18 00:08:19 +0300 |
| commit | 818551e2b2c662a1b26de6b4f7d6b8411a838d18 (patch) | |
| tree | f38b4c951df4d33db81ae7b7765a56bce491c2a8 /drivers/block/null_blk.c | |
| parent | 6010720da8aab51f33beee63b73cf88016e9b250 (diff) | |
| parent | 7520872c0cf4d3df6d74242c6edfb9e70a47df4d (diff) | |
| download | linux-818551e2b2c662a1b26de6b4f7d6b8411a838d18.tar.xz | |
Merge branch 'for-4.11/next' into for-4.11/linus-merge
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/null_blk.c')
| -rw-r--r-- | drivers/block/null_blk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index a67b7ea1e3bf..6f2e565bccc5 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -432,11 +432,11 @@ static int null_lnvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd) struct request *rq; struct bio *bio = rqd->bio; - rq = blk_mq_alloc_request(q, bio_data_dir(bio), 0); + rq = blk_mq_alloc_request(q, + op_is_write(bio_op(bio)) ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN, 0); if (IS_ERR(rq)) return -ENOMEM; - rq->cmd_type = REQ_TYPE_DRV_PRIV; rq->__sector = bio->bi_iter.bi_sector; rq->ioprio = bio_prio(bio); |