diff options
| author | Keith Busch <kbusch@kernel.org> | 2024-01-24 09:27:27 -0800 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2024-01-29 07:02:50 -0800 |
| commit | 6d3c7fb17b4c047ccd0b42cf1308da693ab45acb (patch) | |
| tree | e219029aeb82327159efc5a90f0de9a30a35993b /drivers/nvme/target | |
| parent | 47c5dd66c1840524572dcdd956f4af2bdb6fbdff (diff) | |
| download | linux-6d3c7fb17b4c047ccd0b42cf1308da693ab45acb.tar.gz linux-6d3c7fb17b4c047ccd0b42cf1308da693ab45acb.tar.bz2 linux-6d3c7fb17b4c047ccd0b42cf1308da693ab45acb.zip | |
nvme: use ctrl state accessor
The ctrl->state value is updated in another thread using WRITE_ONCE, so
ensure all the readers use the appropriate accessor.
Reviewed-by: Sagi Grimberg <sagi@grmberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'drivers/nvme/target')
| -rw-r--r-- | drivers/nvme/target/loop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index 2b2e0d00af85..e589915ddef8 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -400,7 +400,7 @@ static void nvme_loop_shutdown_ctrl(struct nvme_loop_ctrl *ctrl) } nvme_quiesce_admin_queue(&ctrl->ctrl); - if (ctrl->ctrl.state == NVME_CTRL_LIVE) + if (nvme_ctrl_state(&ctrl->ctrl) == NVME_CTRL_LIVE) nvme_disable_ctrl(&ctrl->ctrl, true); nvme_cancel_admin_tagset(&ctrl->ctrl); @@ -434,8 +434,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)) { - if (ctrl->ctrl.state != NVME_CTRL_DELETING && - ctrl->ctrl.state != NVME_CTRL_DELETING_NOIO) + enum nvme_ctrl_state state = nvme_ctrl_state(&ctrl->ctrl); + + if (state != NVME_CTRL_DELETING && + state != NVME_CTRL_DELETING_NOIO) /* state change failure for non-deleted ctrl? */ WARN_ON_ONCE(1); return; |