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

Commit 0a960afd authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Jens Axboe
Browse files

nvme-rdma: give up reconnect if state change fails 



If we failed to transition to state LIVE after a successful reconnect,
then controller deletion already started. In this case there is no
point moving forward with reconnect.

Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1a40d972

drivers/nvme/host/rdma.c

+6 −1
Original line number Diff line number Diff line
@@ -942,7 +942,12 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work) 
	}



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

	WARN_ON_ONCE(!changed);

	if (!changed) {

		/* state change failure is ok if we're in DELETING state */

		WARN_ON_ONCE(ctrl->ctrl.state != NVME_CTRL_DELETING);

		return;

	}



	ctrl->ctrl.nr_reconnects = 0;



	nvme_start_ctrl(&ctrl->ctrl);