summaryrefslogtreecommitdiffstats
path: root/drivers/nvme
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2017-08-28 21:40:06 +0200
committerSagi Grimberg <sagi@grimberg.me>2017-08-28 23:00:32 +0300
commit31fdf18401703df246e20fc0382ed3594e6cf8d8 (patch)
tree24da7a1b9bf815f5f20bd086fb5198b4d732ad40 /drivers/nvme
parent3f02fffb74ae7486232fef6ca4341c5e9719c759 (diff)
downloadop-kernel-dev-31fdf18401703df246e20fc0382ed3594e6cf8d8.zip
op-kernel-dev-31fdf18401703df246e20fc0382ed3594e6cf8d8.tar.gz
nvme-rdma: reuse configure/destroy_admin_queue
No need to open-code it. Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
-rw-r--r--drivers/nvme/host/rdma.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index b8c07f2..cdf1422 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -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;
OpenPOWER on IntegriCloud