Commit 45862ebc authored Jul 24, 2016 by Sagi Grimberg

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>

parent a159c64d

drivers/nvme/host/rdma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);