Commit b6cec06d authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Christoph Hellwig
Browse files

nvme-loop: remove extra variable in create ctrl 



We can call the nvme_change_ctrl_state() directly and have
WARN_ON_ONCE(1) call instead of having to use an extra variable which
matches the name of the function.

Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 64d452b3

drivers/nvme/target/loop.c

+6 −8
Original line number Diff line number Diff line
@@ -444,7 +444,6 @@ static void nvme_loop_reset_ctrl_work(struct work_struct *work) 
{

	struct nvme_loop_ctrl *ctrl =

		container_of(work, struct nvme_loop_ctrl, ctrl.reset_work);

	bool changed;

	int ret;



	nvme_stop_ctrl(&ctrl->ctrl);
@@ -471,8 +470,8 @@ static void nvme_loop_reset_ctrl_work(struct work_struct *work) 
	blk_mq_update_nr_hw_queues(&ctrl->tag_set,

			ctrl->ctrl.queue_count - 1);



	changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE);

	WARN_ON_ONCE(!changed);

	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE))

		WARN_ON_ONCE(1);



	nvme_start_ctrl(&ctrl->ctrl);
@@ -567,7 +566,6 @@ static struct nvme_ctrl *nvme_loop_create_ctrl(struct device *dev, 
		struct nvmf_ctrl_options *opts)

{

	struct nvme_loop_ctrl *ctrl;

	bool changed;

	int ret;



	ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
@@ -583,8 +581,8 @@ static struct nvme_ctrl *nvme_loop_create_ctrl(struct device *dev, 
	if (ret)

		goto out_put_ctrl;



	changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING);

	WARN_ON_ONCE(!changed);

	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_CONNECTING))

		WARN_ON_ONCE(1);



	ret = -ENOMEM;
@@ -620,8 +618,8 @@ static struct nvme_ctrl *nvme_loop_create_ctrl(struct device *dev, 
	dev_info(ctrl->ctrl.device,

		 "new ctrl: \"%s\"\n", ctrl->ctrl.opts->subsysnqn);



	changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE);

	WARN_ON_ONCE(!changed);

	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE))

		WARN_ON_ONCE(1);



	mutex_lock(&nvme_loop_ctrl_mutex);

	list_add_tail(&ctrl->list, &nvme_loop_ctrl_list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE