| From e7ae50b2ae3c253cb41864bf8fa263ef8593c2cb Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 26 Feb 2021 08:17:26 +0100 |
| Subject: nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request() |
| |
| From: Hannes Reinecke <hare@suse.de> |
| |
| [ Upstream commit d3589381987ec879b03f8ce3039df57e87f05901 ] |
| |
| 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: Hannes Reinecke <hare@suse.de> |
| Reviewed-by: Keith Busch <kbusch@kernel.org> |
| Reviewed-by: Sagi Grimberg <sagi@grimberg.me> |
| Reviewed-by: Chao Leng <lengchao@huawei.com> |
| Reviewed-by: Daniel Wagner <dwagner@suse.de> |
| Signed-off-by: Christoph Hellwig <hch@lst.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/nvme/host/core.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c |
| index a0f169a2d96f..206bf0a50487 100644 |
| --- a/drivers/nvme/host/core.c |
| +++ b/drivers/nvme/host/core.c |
| @@ -366,6 +366,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; |
| } |
| -- |
| 2.30.1 |
| |
