| Message ID | 20200528151931.3501506-2-kbusch@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PATCHv2,1/2] blk-mq: export __blk_mq_complete_request | expand |
Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index ba860efd250d..f65a0b6cd988 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -310,7 +310,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved) return true; nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD; - blk_mq_complete_request(req); + __blk_mq_complete_request(req); return true; } EXPORT_SYMBOL_GPL(nvme_cancel_request);
Once the driver decides to cancel requests, the concept of those requests timing out ceases to exist. Use __blk_mq_complete_request() to bypass fake timeout error injection so that request reclaim may proceed. Signed-off-by: Keith Busch <kbusch@kernel.org> --- v1->v2: Use new export rather than loop for success drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)