diff options
| author | Jens Axboe <axboe@fb.com> | 2017-02-17 22:08:19 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-17 22:08:19 +0100 |
| commit | 818551e2b2c662a1b26de6b4f7d6b8411a838d18 (patch) | |
| tree | f38b4c951df4d33db81ae7b7765a56bce491c2a8 /drivers/nvme/host/pci.c | |
| parent | Merge branch 'for-4.11/block' into for-4.11/linus-merge (diff) | |
| parent | block: don't defer flushes on blk-mq + scheduling (diff) | |
| download | linux-818551e2b2c662a1b26de6b4f7d6b8411a838d18.tar.xz linux-818551e2b2c662a1b26de6b4f7d6b8411a838d18.zip | |
Merge branch 'for-4.11/next' into for-4.11/linus-merge
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme/host/pci.c')
| -rw-r--r-- | drivers/nvme/host/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index d67d0d0a3bc0..ddc51adb594d 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -589,7 +589,7 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx, */ if (ns && ns->ms && !blk_integrity_rq(req)) { if (!(ns->pi_type && ns->ms == 8) && - req->cmd_type != REQ_TYPE_DRV_PRIV) { + !blk_rq_is_passthrough(req)) { blk_mq_end_request(req, -EFAULT); return BLK_MQ_RQ_QUEUE_OK; } @@ -646,7 +646,7 @@ static void nvme_complete_rq(struct request *req) return; } - if (req->cmd_type == REQ_TYPE_DRV_PRIV) + if (blk_rq_is_passthrough(req)) error = req->errors; else error = nvme_error_status(req->errors); |