Skip to content

Commit 45862eb

Browse files
committed
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 <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]>
1 parent a159c64 commit 45862eb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/nvme/host/rdma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,7 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl)
16461646
nvme_rdma_free_io_queues(ctrl);
16471647
}
16481648

1649-
if (ctrl->ctrl.state == NVME_CTRL_LIVE)
1649+
if (test_bit(NVME_RDMA_Q_CONNECTED, &ctrl->queues[0].flags))
16501650
nvme_shutdown_ctrl(&ctrl->ctrl);
16511651

16521652
blk_mq_stop_hw_queues(ctrl->ctrl.admin_q);

0 commit comments

Comments
 (0)