Commit 3382a567 authored May 29, 2020 by Keith Busch Committed by Jens Axboe May 29, 2020

nvme: force complete cancelled requests



Use blk_mq_foce_complete_rq() to bypass fake timeout error injection so
that request reclaim may proceed.

Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 7b11eab0

drivers/nvme/host/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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_force_complete_rq(req);
		return true;
		}
		EXPORT_SYMBOL_GPL(nvme_cancel_request);

Admin message