diff options
| author | Sagi Grimberg | 2017-05-04 12:33:15 +0200 |
|---|---|---|
| committer | Christoph Hellwig | 2017-06-15 14:29:49 +0200 |
| commit | fdf9dfa85093f9813bc9818b7920fcf5a0eb3580 (patch) | |
| tree | 32522071605adb2bcee5bdbb22c4e5f7e7968467 /drivers/nvme/host/fc.c | |
| parent | nvme: queue ns scanning and async request from nvme_wq (diff) | |
| download | kernel-qcow2-linux-fdf9dfa85093f9813bc9818b7920fcf5a0eb3580.tar.gz kernel-qcow2-linux-fdf9dfa85093f9813bc9818b7920fcf5a0eb3580.tar.xz kernel-qcow2-linux-fdf9dfa85093f9813bc9818b7920fcf5a0eb3580.zip | |
nvme: move nr_reconnects to nvme_ctrl
It is not a user option but rather a variable controller
attribute.
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host/fc.c')
| -rw-r--r-- | drivers/nvme/host/fc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index e6084f3b365f..ba9024a20bac 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2310,7 +2310,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) int ret; bool changed; - ++ctrl->ctrl.opts->nr_reconnects; + ++ctrl->ctrl.nr_reconnects; /* * Create the admin queue @@ -2407,7 +2407,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE); WARN_ON_ONCE(!changed); - ctrl->ctrl.opts->nr_reconnects = 0; + ctrl->ctrl.nr_reconnects = 0; if (ctrl->queue_count > 1) { nvme_start_queues(&ctrl->ctrl); @@ -2612,7 +2612,7 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status) dev_warn(ctrl->ctrl.device, "NVME-FC{%d}: Max reconnect attempts (%d) " "reached. Removing controller\n", - ctrl->cnum, ctrl->ctrl.opts->nr_reconnects); + ctrl->cnum, ctrl->ctrl.nr_reconnects); WARN_ON(__nvme_fc_schedule_delete_work(ctrl)); } } |