diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 1043fd0b91e1e1d5c8f84d0c8ad436a89a61cacb..04788844368977935b9d1daf131dd71ec452f07e 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -298,7 +298,7 @@ void nvme_cancel_request(struct request *req, void *data, bool reserved) if (blk_mq_request_completed(req)) return; - nvme_req(req)->status = NVME_SC_ABORT_REQ; + nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD; blk_mq_complete_request(req); } diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 2b0479c5fdd8c776542e18245ed9f965ac17ecfe..9167ba3163acd2d4f75a389c6cc13772a63da048 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -98,6 +98,7 @@ bool nvme_failover_req(struct request *req) } break; case NVME_SC_HOST_PATH_ERROR: + case NVME_SC_HOST_ABORTED_CMD: /* * Temporary transport disruption in talking to the controller. * Try to send on a new path. diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 60b492116e1bb6f2fec1949dd9d010de6b3be159..412eb5928adcaa1b77163db28ee151f579ee0abd 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -1256,6 +1256,7 @@ enum { NVME_SC_ANA_INACCESSIBLE = 0x302, NVME_SC_ANA_TRANSITION = 0x303, NVME_SC_HOST_PATH_ERROR = 0x370, + NVME_SC_HOST_ABORTED_CMD = 0x371, NVME_SC_CRD = 0x1800, NVME_SC_DNR = 0x4000,