aboutsummaryrefslogtreecommitdiff
path: root/drivers/nvme/host/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/nvme/host/core.c')
-rw-r--r--drivers/nvme/host/core.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 9e75f6f62471..c9826ecf80e2 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -274,13 +274,14 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
return COMPLETE;
if (req->cmd_flags & REQ_NVME_MPATH) {
- if (nvme_is_path_error(nvme_req(req)->status))
+ if (nvme_is_path_error(nvme_req(req)->status) ||
+ blk_queue_dying(req->q))
return FAILOVER;
+ } else {
+ if (blk_queue_dying(req->q))
+ return COMPLETE;
}
- if (blk_queue_dying(req->q))
- return COMPLETE;
-
return RETRY;
}