Unverified Commit f11d7c71 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1666 nvme-pci: fix timeout request state check 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yong Hu <yong.hu@windriver.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OJQ44W3YB5MJ7JRCNWRHAA5I7OQ6L3XP/ 
 
https://gitee.com/openeuler/kernel/issues/I7R4BC 
 
Link:https://gitee.com/openeuler/kernel/pulls/1666

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 2e7a3cda 31b9bdc2

drivers/nvme/host/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) 
	else

		nvme_poll_irqdisable(nvmeq);



	if (blk_mq_request_completed(req)) {

	if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT) {

		dev_warn(dev->ctrl.device,

			 "I/O %d QID %d timeout, completion polled\n",

			 req->tag, nvmeq->qid);