diff options
| author |  Christoph Hellwig <hch@lst.de>
| 2022-11-22 08:48:13 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de>
| 2022-12-06 14:36:54 +0100 |
| commit | 8cb9f10b7151e308824cdcf3168010d673e7888c (patch) | |
| tree | 981747922c8ed23f23cfb7ba0c419169b275c1c2 /drivers/nvme | |
| parent | nvme-pci: rename nvme_disable_io_queues (diff) | |
| download | linux-8cb9f10b7151e308824cdcf3168010d673e7888c.tar.gz linux-8cb9f10b7151e308824cdcf3168010d673e7888c.tar.bz2 linux-8cb9f10b7151e308824cdcf3168010d673e7888c.zip | |
nvme-pci: return early on ctrl state mismatch in nvme_reset_work
The only way nvme_reset_work could be called when not in resetting state
is if a reset and remove happen near the same time. This should not
happen, but if it did we don't want the reset work to disable the
controller because the remove is already doing that.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 1b527377e351..02940b4f42b1 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2792,8 +2792,7 @@ 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); - result = -ENODEV; - goto out; + return; } /* |