Commit 599d9f3a authored by Nilay Shroff's avatar Nilay Shroff Committed by Keith Busch
Browse files

nvme: use helper nvme_ctrl_state in nvme_keep_alive_finish function 



We no more need acquiring ctrl->lock before accessing the
NVMe controller state and instead we can now use the helper
nvme_ctrl_state. So replace the use of ctrl->lock from
nvme_keep_alive_finish function with nvme_ctrl_state call.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNilay Shroff <nilay@linux.ibm.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent d0692367

drivers/nvme/host/core.c

+2 −8
Original line number Diff line number Diff line
@@ -1295,10 +1295,9 @@ static void nvme_queue_keep_alive_work(struct nvme_ctrl *ctrl) 
static void nvme_keep_alive_finish(struct request *rq,

		blk_status_t status, struct nvme_ctrl *ctrl)

{

	unsigned long flags;

	bool startka = false;

	unsigned long rtt = jiffies - (rq->deadline - rq->timeout);

	unsigned long delay = nvme_keep_alive_work_period(ctrl);

	enum nvme_ctrl_state state = nvme_ctrl_state(ctrl);



	/*

	 * Subtract off the keepalive RTT so nvme_keep_alive_work runs
@@ -1321,12 +1320,7 @@ static void nvme_keep_alive_finish(struct request *rq, 


	ctrl->ka_last_check_time = jiffies;

	ctrl->comp_seen = false;

	spin_lock_irqsave(&ctrl->lock, flags);

	if (ctrl->state == NVME_CTRL_LIVE ||

	    ctrl->state == NVME_CTRL_CONNECTING)

		startka = true;

	spin_unlock_irqrestore(&ctrl->lock, flags);

	if (startka)

	if (state == NVME_CTRL_LIVE || state == NVME_CTRL_CONNECTING)

		queue_delayed_work(nvme_wq, &ctrl->ka_work, delay);

}