Commit d8e43700 authored by Keith Busch's avatar Keith Busch Committed by Yang Yingliang
Browse files

nvme: force complete cancelled requests



mainline inclusion
from mainline-5.8-rc1
commit 3382a567
category: bugfix
bugzilla: 175150
CVE: NA

---------------------------

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

Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>

Conflicts:
	drivers/nvme/host/core.c
	[ 7baa8572("blk-mq-tag: change busy_iter_fn to return
	  whether to continue or not") is not applied. ]

Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent f688012c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment