Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ce872bf authored by James Smart's avatar James Smart Committed by Christoph Hellwig
Browse files

nvme_fc: get rid of local reconnect_delay 



Remove the local copy of reconnect_delay.
Use the value in the controller options directly.

Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 7254a50a

drivers/nvme/host/fc.c

+4 −6
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ struct nvme_fc_ctrl { 
	struct work_struct	delete_work;

	struct work_struct	reset_work;

	struct delayed_work	connect_work;

	int			reconnect_delay;

	int			connect_attempts;



	struct kref		ref;
@@ -2615,9 +2614,9 @@ nvme_fc_reset_ctrl_work(struct work_struct *work) 


		dev_warn(ctrl->ctrl.device,

			"NVME-FC{%d}: Reconnect attempt in %d seconds.\n",

			ctrl->cnum, ctrl->reconnect_delay);

			ctrl->cnum, ctrl->ctrl.opts->reconnect_delay);

		queue_delayed_work(nvme_fc_wq, &ctrl->connect_work,

				ctrl->reconnect_delay * HZ);

				ctrl->ctrl.opts->reconnect_delay * HZ);

	} else

		dev_info(ctrl->ctrl.device,

			"NVME-FC{%d}: controller reset complete\n", ctrl->cnum);
@@ -2695,9 +2694,9 @@ nvme_fc_connect_ctrl_work(struct work_struct *work) 


		dev_warn(ctrl->ctrl.device,

			"NVME-FC{%d}: Reconnect attempt in %d seconds.\n",

			ctrl->cnum, ctrl->reconnect_delay);

			ctrl->cnum, ctrl->ctrl.opts->reconnect_delay);

		queue_delayed_work(nvme_fc_wq, &ctrl->connect_work,

				ctrl->reconnect_delay * HZ);

				ctrl->ctrl.opts->reconnect_delay * HZ);

	} else

		dev_info(ctrl->ctrl.device,

			"NVME-FC{%d}: controller reconnect complete\n",
@@ -2755,7 +2754,6 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
	INIT_WORK(&ctrl->delete_work, nvme_fc_delete_ctrl_work);

	INIT_WORK(&ctrl->reset_work, nvme_fc_reset_ctrl_work);

	INIT_DELAYED_WORK(&ctrl->connect_work, nvme_fc_connect_ctrl_work);

	ctrl->reconnect_delay = opts->reconnect_delay;

	spin_lock_init(&ctrl->lock);



	/* io queue count */