Skip to content

Commit

Permalink
nvme-rdma: reuse configure/destroy_admin_queue
Browse files Browse the repository at this point in the history
No need to open-code it.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
sagigrimberg committed Aug 28, 2017
1 parent 3f02fff commit 31fdf18
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions drivers/nvme/host/rdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -857,24 +857,8 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work)
goto requeue;
}

nvme_rdma_stop_and_free_queue(&ctrl->queues[0]);

ret = blk_mq_reinit_tagset(&ctrl->admin_tag_set,
nvme_rdma_reinit_request);
if (ret)
goto requeue;

ret = nvme_rdma_init_queue(ctrl, 0, NVME_AQ_DEPTH);
if (ret)
goto requeue;

ret = nvmf_connect_admin_queue(&ctrl->ctrl);
if (ret)
goto requeue;

set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[0].flags);

ret = nvme_enable_ctrl(&ctrl->ctrl, ctrl->ctrl.cap);
nvme_rdma_destroy_admin_queue(ctrl, false);
ret = nvme_rdma_configure_admin_queue(ctrl, false);
if (ret)
goto requeue;

Expand Down

0 comments on commit 31fdf18

Please sign in to comment.