Merge tag 'for-5.8/drivers-2020-06-01' of git://git.kernel.dk/linux-block

[thirdparty/linux.git] / drivers / nvme / host / core.c

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 569671e264b509157c512968265f9c87b5ad36d4..0585efa47d8fd8842a6675229dbaef976e1412ad 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -304,7 +304,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_force_complete_rq(req);
        return true;
 }
 EXPORT_SYMBOL_GPL(nvme_cancel_request);