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

…k-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
mariux64 · Feb 28, 2020 · 5b8ea58 · 5b8ea58
2 parents cae740a + 9515743
commit 5b8ea58
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
 }