system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-22 19:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

nvme-rdma: get rid of local reconnect_delay

Browse source 
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>
This commit is contained in:
Sagi Grimberg 2017-03-18 23:47:22 +02:00 committed by Jens Axboe
parent 3b06837630
commit 7777bdedf3
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/nvme/host/rdma.c
View file

@ -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);