Commit 1fcfca78 authored by Guixin Liu's avatar Guixin Liu Committed by Jens Axboe
Browse files

nvme-pci: use nvme core helper to cancel requests in tagset 



Use nvme core helper nvme_cancel_tagset and nvme_cancel_admin_tagset
instead of same logic code.

Signed-off-by: default avatarGuixin Liu <kanie@linux.alibaba.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarRuozhu Li <liruozhu@huawei.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 53ee9e29

drivers/nvme/host/pci.c

+2 −4
Original line number Diff line number Diff line
@@ -2725,10 +2725,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 
	nvme_pci_disable(dev);

	nvme_reap_pending_cqes(dev);



	blk_mq_tagset_busy_iter(&dev->tagset, nvme_cancel_request, &dev->ctrl);

	blk_mq_tagset_busy_iter(&dev->admin_tagset, nvme_cancel_request, &dev->ctrl);

	blk_mq_tagset_wait_completed_request(&dev->tagset);

	blk_mq_tagset_wait_completed_request(&dev->admin_tagset);

	nvme_cancel_tagset(&dev->ctrl);

	nvme_cancel_admin_tagset(&dev->ctrl);



	/*

	 * The driver will not be starting up queues again if shutting down so