diff options
| author |   Hannes Reinecke <hare@suse.de> | 2021-05-26 17:23:18 +0200 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2021-06-02 10:06:53 +0300 |
| commit | 6622f9acd29cd4f6272720e827e6406f5a970cb0 (patch) | |
| tree | 9cf44c00d2699bd63d8cde097cf42e9f08961009 /drivers/nvme/target | |
| parent | nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue() (diff) | |
| download | linux-dev-6622f9acd29cd4f6272720e827e6406f5a970cb0.tar.xz linux-dev-6622f9acd29cd4f6272720e827e6406f5a970cb0.zip | |
nvme-loop: do not warn for deleted controllers during reset
During concurrent reset and delete calls the reset workqueue is
flushed, causing nvme_loop_reset_ctrl_work() to be executed when
the controller is in state DELETING or DELETING_NOIO.
But this is expected, so we shouldn't issue a WARN_ON here.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/target')
| -rw-r--r-- | drivers/nvme/target/loop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index 209ad4bc2695..a5c4a1865026 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -465,8 +465,10 @@ static void nvme_loop_reset_ctrl_work(struct work_struct *work) nvme_loop_shutdown_ctrl(ctrl); if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING)) { - /* state change failure should never happen */ - WARN_ON_ONCE(1); + if (ctrl->ctrl.state != NVME_CTRL_DELETING && + ctrl->ctrl.state != NVME_CTRL_DELETING_NOIO) + /* state change failure for non-deleted ctrl? */ + WARN_ON_ONCE(1); return; } |