Commit d3589381 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request() 



NVME_REQ_CANCELLED is translated into -EINTR in nvme_submit_sync_cmd(),
so we should be setting this flags during nvme_cancel_request() to
ensure that the callers to nvme_submit_sync_cmd() will get the correct
error code when the controller is reset.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChao Leng <lengchao@huawei.com>
Reviewed-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d95c1f41

drivers/nvme/host/core.c

+1 −0
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved) 
		return true;



	nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;

	nvme_req(req)->flags |= NVME_REQ_CANCELLED;

	blk_mq_complete_request(req);

	return true;

}