nvme: update and rename nvme_cancel_io to nvme_cancel_request (e1958e65) · Commits · 戴 / test

nvme_cancel_io is a bit confusing (given the distinction of io/admin), so rename it to nvme_cancel_request. And update it a bit to pass in struct nvme_ctrl, so it can be used by Fabrics driver also. Signed-off-by:

Ming Lin <ming.l@samsung.com> Reviewed-by:

Christoph Hellwig <hch@lst.de> Suggested-by:

Sagi Grimberg <sagi@grimberg.me> Reviewed-by:

Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by:

Keith Busch <keith.bsuch@intel.com> Signed-off-by:

Jens Axboe <axboe@fb.com>

drivers/nvme/host/pci.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -919,14 +919,14 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
		return BLK_EH_RESET_TIMER;
		}

		static void nvme_cancel_io(struct request req, void data, bool reserved)
		static void nvme_cancel_request(struct request req, void data, bool reserved)
		{
		int status;

		if (!blk_mq_request_started(req))
		return;

		dev_dbg_ratelimited(((struct nvme_dev *) data)->ctrl.device,
		dev_dbg_ratelimited(((struct nvme_ctrl *) data)->device,
		"Cancelling I/O %d", req->tag);

		status = NVME_SC_ABORT_REQ;
		@@ -1722,8 +1722,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
		}
		nvme_pci_disable(dev);

		blk_mq_tagset_busy_iter(&dev->tagset, nvme_cancel_io, dev);
		blk_mq_tagset_busy_iter(&dev->admin_tagset, nvme_cancel_io, 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);
		mutex_unlock(&dev->shutdown_lock);
		}

Admin message