diff options
| author | Keith Busch <kbusch@kernel.org> | 2023-06-28 16:51:02 +0200 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2023-06-30 19:48:20 +0200 |
| commit | 4e69d4dabd2379af57b0b8fb9b0d62c23f9cd3b8 (patch) | |
| tree | 0ce03217ba82e5973639e4b12d2d02de6160dd82 /drivers/nvme/host | |
| parent | nvme: sync timeout work on failed reset (diff) | |
| download | linux-4e69d4dabd2379af57b0b8fb9b0d62c23f9cd3b8.tar.xz linux-4e69d4dabd2379af57b0b8fb9b0d62c23f9cd3b8.zip | |
nvme: disable controller on reset state failure
If the controller is not in a RESETTING state at the point of reset
work, we have to conclude the controller is being deleted. Go to the
cleanup on this condition to ensure proper pairing of request_queue
quiesce state.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'drivers/nvme/host')
| -rw-r--r-- | drivers/nvme/host/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index bfeadecf9e15..c9224d39195e 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2690,7 +2690,8 @@ static void nvme_reset_work(struct work_struct *work) if (dev->ctrl.state != NVME_CTRL_RESETTING) { dev_warn(dev->ctrl.device, "ctrl state %d is not RESETTING\n", dev->ctrl.state); - return; + result = -ENODEV; + goto out; } /* |