diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2016-07-24 09:26:16 +0300 |
|---|---|---|
| committer | Sagi Grimberg <sagi@grimberg.me> | 2016-08-03 16:25:23 +0300 |
| commit | 45862ebcc4883b1b6bc0701cd15cb2b68b140c5d (patch) | |
| tree | 6c274f105ac69ec1ddea685ece0893bab0a22739 /drivers/nvme | |
| parent | a159c64d936eb0d1da29d8ad384183d8984899c9 (diff) | |
| download | linux-45862ebcc4883b1b6bc0701cd15cb2b68b140c5d.tar.xz | |
nvme-rdma: Make sure to shutdown the controller if we can
Relying on ctrl state in nvme_rdma_shutdown_ctrl is wrong because
it will never be NVME_CTRL_LIVE (delete_ctrl or reset_ctrl invoked it).
Instead, check that the admin queue is connected. Note that it is safe
because we can never see a copmeting thread trying to destroy the admin
queue (reset or delete controller).
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/rdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 6378dc94aeaf..f4b836869d2c 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1646,7 +1646,7 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl) nvme_rdma_free_io_queues(ctrl); } - if (ctrl->ctrl.state == NVME_CTRL_LIVE) + if (test_bit(NVME_RDMA_Q_CONNECTED, &ctrl->queues[0].flags)) nvme_shutdown_ctrl(&ctrl->ctrl); blk_mq_stop_hw_queues(ctrl->ctrl.admin_q); |