NVMe: Don't use fake status on cancelled command

Synchronized commands do different things for timed out commands
vs. controller returned errors.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index a45700312caf..2cbe1b4daef2 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -613,7 +613,10 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx,
                         return;
                 }
                 if (req->cmd_type == REQ_TYPE_DRV_PRIV) {
-                        req->errors = status;
+                        if (cmd_rq->ctx == CMD_CTX_CANCELLED)
+                                req->errors = -EINTR;
+                        else
+                                req->errors = status;
                 } else {
                         req->errors = nvme_error_status(status);
                 }