diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2017-03-18 23:47:22 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-04 09:48:23 -0600 |
| commit | 7777bdedf31d674c4fd5ebbfbd27a6a6ae0a17e0 (patch) | |
| tree | 7ddf826d8639efb95d90e490e1ec9e74b0e57647 | |
| parent | 3b068376306bf44de6fdc0f3bff6072d8cdc8481 (diff) | |
| download | linux-0-day-7777bdedf31d674c4fd5ebbfbd27a6a6ae0a17e0.tar.gz linux-0-day-7777bdedf31d674c4fd5ebbfbd27a6a6ae0a17e0.tar.xz | |
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>
| -rw-r--r-- | drivers/nvme/host/rdma.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 8592adac47474..8c873be308c61 100644 --- 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); |