Commit bddb911d authored by Keith Busch's avatar Keith Busch
Browse files

nvme: skip trace completion for host path errors 



The command was never dispatched for the driver's "host path error", so
the command was never actually initialized and there's no corresponding
submit trace for the completion.

Reported-by: default avatarMinsik Jeon <hmi.jeon@samsung.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent cf92d78a

drivers/nvme/host/core.c

+8 −3
Original line number Diff line number Diff line
@@ -454,11 +454,10 @@ void nvme_end_req(struct request *req) 
	blk_mq_end_request(req, status);

}



void nvme_complete_rq(struct request *req)

static void __nvme_complete_rq(struct request *req)

{

	struct nvme_ctrl *ctrl = nvme_req(req)->ctrl;



	trace_nvme_complete_rq(req);

	nvme_cleanup_cmd(req);



	/*
@@ -493,6 +492,12 @@ void nvme_complete_rq(struct request *req) 
		return;

	}

}



void nvme_complete_rq(struct request *req)

{

	trace_nvme_complete_rq(req);

	__nvme_complete_rq(req);

}

EXPORT_SYMBOL_GPL(nvme_complete_rq);



void nvme_complete_batch_req(struct request *req)
@@ -513,7 +518,7 @@ blk_status_t nvme_host_path_error(struct request *req) 
{

	nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR;

	blk_mq_set_request_complete(req);

	nvme_complete_rq(req);

	__nvme_complete_rq(req);

	return BLK_STS_OK;

}

EXPORT_SYMBOL_GPL(nvme_host_path_error);