From: Sagi Grimberg <sagi@grimberg.me>
Date: Sun, 29 Oct 2017 12:21:01 +0000 (+0200)
Subject: nvme-rdma: reuse nvme_delete_ctrl when reconnect attempts expire
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=12fa1304badde26c5cf495d5af48df22a31c3a52;p=openwrt%2Fstaging%2Fblogic.git

nvme-rdma: reuse nvme_delete_ctrl when reconnect attempts expire

instead of just queueing delete work

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index ed6e05018a92..03644ecf68d2 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -912,7 +912,7 @@ static void nvme_rdma_reconnect_or_remove(struct nvme_rdma_ctrl *ctrl)
 				ctrl->ctrl.opts->reconnect_delay * HZ);
 	} else {
 		dev_info(ctrl->ctrl.device, "Removing controller...\n");
-		queue_work(nvme_wq, &ctrl->ctrl.delete_work);
+		nvme_delete_ctrl(&ctrl->ctrl);
 	}
 }