Commit 5b8ea58b authored by Jens Axboe's avatar Jens Axboe
Browse files

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
parents cae740a0 9515743b

drivers/nvme/host/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}