diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-02-28 10:02:36 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-02-28 10:02:36 -0700 |
| commit | 5b8ea58b6a338cb981670c4408225331aedb4b89 (patch) | |
| tree | abe811e8684f25b41397639a2c41b54466bbc8a1 | |
| parent | cae740a04b4d6d5166f19ee5faf04ea2a1f34b3d (diff) | |
| parent | 9515743bfb39c61aaf3d4f3219a645c8d1fe9a0e (diff) | |
Merge branch 'nvme-5.6-rc4' of git://git.infradead.org/nvme into block-5.6
Pull NVMe fix from Keith.
* 'nvme-5.6-rc4' of git://git.infradead.org/nvme:
nvme-pci: Hold cq_poll_lock while completing CQEs
| -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 ace4dd9e953c..d3f23d6254e4 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1078,9 +1078,9 @@ static int nvme_poll(struct blk_mq_hw_ctx *hctx) spin_lock(&nvmeq->cq_poll_lock); found = nvme_process_cq(nvmeq, &start, &end, -1); + nvme_complete_cqes(nvmeq, start, end); spin_unlock(&nvmeq->cq_poll_lock); - nvme_complete_cqes(nvmeq, start, end); return found; } |