diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-01-20 08:08:29 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-01-20 08:08:29 -0700 |
| commit | 955bc12299b17aa60325e1748336e1fd1e664ed0 (patch) | |
| tree | 352ee97926f7f9c8a347d8109fbbffdb7607b4b6 /drivers/nvme/host/pci.c | |
| parent | 7746564793978fe2f43b18a302b22dca0ad3a0e8 (diff) | |
| parent | 1c5842085851f786eba24a39ecd02650ad892064 (diff) | |
Merge tag 'nvme-6.2-2023-01-20' of git://git.infradead.org/nvme into block-6.2block-6.2-2023-01-20
Pull NVMe fixes from Christoph:
"nvme fixes for Linux 6.2
- fix controller shutdown regression in nvme-apple (Janne Grunau)
- fix a polling on timeout regression in nvme-pci (Keith Busch)"
* tag 'nvme-6.2-2023-01-20' of git://git.infradead.org/nvme:
nvme-pci: fix timeout request state check
nvme-apple: only reset the controller when RTKit is running
nvme-apple: reset controller during shutdown
Diffstat (limited to 'drivers/nvme/host/pci.c')
| -rw-r--r-- | drivers/nvme/host/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index a2553b7d9bb8..1ff8843bc4b3 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1362,7 +1362,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req) else nvme_poll_irqdisable(nvmeq); - if (blk_mq_request_completed(req)) { + if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT) { dev_warn(dev->ctrl.device, "I/O %d QID %d timeout, completion polled\n", req->tag, nvmeq->qid); |