nvme-pci: use nvme core helper to cancel requests in tagset
PATCH 1/1 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 Guixin Liu <[email protected]>
--- drivers/nvme/host/pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/nvme/host/pci.c +2 -4
@@ -2720,10 +2720,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
Signature · 1 line
1.8.3.1
Quoted 15 lines · Guixin Liu
Use nvme core helper
nvme_cancel_tagsetandnvme_cancel_admin_tagsetinstead of same logic code.Signed-off-by Guixin Liu <[email protected]>--- drivers/nvme/host/pci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/nvme/host/pci.c +0
-0@@ -2720,10 +2720,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)nvme_pci_disable (dev);nvme_reap_pending_cqes (dev);
drivers/nvme/host/pci.c static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) · line 2727
Quoted 10 lines
drivers/nvme/host/pci.c +2
-4-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
Looks good to me,
Reviewed-by Ruozhu Li <[email protected]>
Reviewed-by Sagi Grimberg <[email protected]>
Thanks,
applied to nvme-5.20.