diff options
| author | Jens Axboe <axboe@fb.com> | 2014-11-14 17:47:32 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-11-20 19:10:03 +0100 |
| commit | 2c30540b38d683d4c7f06d13a451f67d4362d7b1 (patch) | |
| tree | 490cba2c04664298b43e2e5b62a2fb428a3ca345 /drivers/block | |
| parent | NVMe: make setup work for devices that don't do INTx (diff) | |
| download | linux-2c30540b38d683d4c7f06d13a451f67d4362d7b1.tar.xz linux-2c30540b38d683d4c7f06d13a451f67d4362d7b1.zip | |
NVMe: add ->exit_hctx() hook
If we do teardown and setup of the queue and block related parts
of the driver, then we should clear nvmeq->hctx once we kill the
hardware queue.
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nvme-core.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 9310fe51382e..ba278ae00705 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -171,6 +171,13 @@ static int nvme_admin_init_request(void *data, struct request *req, return 0; } +static void nvme_exit_hctx(struct blk_mq_hw_ctx *hctx, unsigned int hctx_idx) +{ + struct nvme_queue *nvmeq = hctx->driver_data; + + nvmeq->hctx = NULL; +} + static int nvme_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, unsigned int hctx_idx) { @@ -1335,6 +1342,7 @@ static struct blk_mq_ops nvme_mq_admin_ops = { .queue_rq = nvme_admin_queue_rq, .map_queue = blk_mq_map_queue, .init_hctx = nvme_admin_init_hctx, + .exit_hctx = nvme_exit_hctx, .init_request = nvme_admin_init_request, .timeout = nvme_timeout, }; @@ -1343,6 +1351,7 @@ static struct blk_mq_ops nvme_mq_ops = { .queue_rq = nvme_queue_rq, .map_queue = blk_mq_map_queue, .init_hctx = nvme_init_hctx, + .exit_hctx = nvme_exit_hctx, .init_request = nvme_init_request, .timeout = nvme_timeout, }; |