nvme-rdma: get rid of local reconnect_delay

we already have it in opts.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 8592adac4747465829c985d3ccf3c3fffc595ce7..8c873be308c6100e83a860380749216569ef8aea 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -118,7 +118,6 @@ struct nvme_rdma_ctrl {
 
        struct nvme_rdma_qe     async_event_sqe;
 
-       int                     reconnect_delay;
        struct delayed_work     reconnect_work;
 
        struct list_head        list;
@@ -777,7 +776,7 @@ requeue:
                dev_info(ctrl->ctrl.device,
                        "Failed reconnect attempt, requeueing...\n");
                queue_delayed_work(nvme_rdma_wq, &ctrl->reconnect_work,
-                                       ctrl->reconnect_delay * HZ);
+                               ctrl->ctrl.opts->reconnect_delay * HZ);
        }
 }
 
@@ -806,10 +805,10 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work)
                                nvme_cancel_request, &ctrl->ctrl);
 
        dev_info(ctrl->ctrl.device, "reconnecting in %d seconds\n",
-               ctrl->reconnect_delay);
+               ctrl->ctrl.opts->reconnect_delay);
 
        queue_delayed_work(nvme_rdma_wq, &ctrl->reconnect_work,
-                               ctrl->reconnect_delay * HZ);
+                               ctrl->ctrl.opts->reconnect_delay * HZ);
 }
 
 static void nvme_rdma_error_recovery(struct nvme_rdma_ctrl *ctrl)
@@ -1893,7 +1892,6 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev,
        if (ret)
                goto out_free_ctrl;
 
-       ctrl->reconnect_delay = opts->reconnect_delay;
        INIT_DELAYED_WORK(&ctrl->reconnect_work,
                        nvme_rdma_reconnect_ctrl_work);
        INIT_WORK(&ctrl->err_work, nvme_rdma_error_recovery_work);