Commit 7777bded authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Jens Axboe
Browse files

nvme-rdma: get rid of local reconnect_delay 



we already have it in opts.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 3b068376

drivers/nvme/host/rdma.c

+3 −5
Original line number Diff line number Diff line
@@ -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 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work) 
		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);