Skip to content

Commit 5ad0b1b

Browse files
keithbuschgregkh
authored andcommitted
nvme-pci: fix queue unquiesce check on slot_reset
[ Upstream commit a754012 ] A zero return means the reset was successfully scheduled. We don't want to unquiesce the queues while the reset_work is pending, as that will just flush out requeued requests to a failed completion. Fixes: 71a5bb1 ("nvme: ensure disabling pairs with unquiesce") Reported-by: Dhankaran Singh Ajravat <dhankaran@meta.com> Signed-off-by: Keith Busch <kbusch@kernel.org> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 226beac commit 5ad0b1b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/nvme/host/pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3535,7 +3535,7 @@ static pci_ers_result_t nvme_slot_reset(struct pci_dev *pdev)
35353535

35363536
dev_info(dev->ctrl.device, "restart after slot reset\n");
35373537
pci_restore_state(pdev);
3538-
if (!nvme_try_sched_reset(&dev->ctrl))
3538+
if (nvme_try_sched_reset(&dev->ctrl))
35393539
nvme_unquiesce_io_queues(&dev->ctrl);
35403540
return PCI_ERS_RESULT_RECOVERED;
35413541
}

0 commit comments

Comments
 (0)