From d6034240f1d6bc24ac4eded8e0f8d43865c32ad4 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Fri, 8 Nov 2019 11:04:06 -0700 Subject: [PATCH] bdev_nvme: pass nvme_bdev_ctrlr to bdev_nvme_reset This is the data structure we end up using here anyways, and it will make this function a little bit more versatile. Change-Id: I530cb5b1b94f57cad4bb3931fc4b7a6335b6a00e Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/473742 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Jim Harris Reviewed-by: Alexey Marchuk Reviewed-by: Shuhei Matsumoto --- module/bdev/nvme/bdev_nvme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 1513373ad..256272dd0 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -375,10 +375,10 @@ _bdev_nvme_reset_destroy_qpair(struct spdk_io_channel_iter *i) } static int -bdev_nvme_reset(struct nvme_bdev *nbdev, struct nvme_bdev_io *bio) +bdev_nvme_reset(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_io *bio) { /* First, delete all NVMe I/O queue pairs. */ - spdk_for_each_channel(nbdev->nvme_bdev_ctrlr, + spdk_for_each_channel(nvme_bdev_ctrlr, _bdev_nvme_reset_destroy_qpair, bio, _bdev_nvme_reset); @@ -464,7 +464,7 @@ _bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_ bdev_io->u.bdev.num_blocks); case SPDK_BDEV_IO_TYPE_RESET: - return bdev_nvme_reset(nbdev, nbdev_io); + return bdev_nvme_reset(nbdev->nvme_bdev_ctrlr, nbdev_io); case SPDK_BDEV_IO_TYPE_FLUSH: return bdev_nvme_flush(nbdev,