projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4af0e21
)
NVMe: Don't use fake status on cancelled command
author
Keith Busch
<keith.busch@intel.com>
Mon, 8 Jun 2015 16:08:14 +0000
(10:08 -0600)
committer
Jens Axboe
<axboe@fb.com>
Sat, 27 Jun 2015 17:42:50 +0000
(11:42 -0600)
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>
drivers/block/nvme-core.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/block/nvme-core.c
b/drivers/block/nvme-core.c
index a45700312cafdbb0de92622def6f7e91c580dd2f..2cbe1b4daef277d8bddd21451c5bfd65b48c2a70 100644
(file)
--- 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);
}