projects/linux·commit 5b8ea58b

Merge branch 'nvme-5.6-rc4' of git://git.infradead.org/nvme into block-5.6

5b8ea58b · Jens Axboe <[email protected]> · 2020-02-28 10:02:36 -07:00

Pull NVMe fix from Keith.

* 'nvme-5.6-rc4' of git://git.infradead.org/nvme:
  nvme-pci: Hold cq_poll_lock while completing CQEs
Commit
5b8ea58b6a338cb981670c4408225331aedb4b89
Parents
cae740a0 · 9515743b

Merge commit. Changes below are compared with the first parent: cae740a0.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/nvme/host/pci.cmodified+1−1View file

drivers/nvme/host/pci.c

View file
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index ace4dd9..d3f23d6 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;
}