From bf22ddc60fe88dd2d409131cc1d3ace14cb2c2a2 Mon Sep 17 00:00:00 2001 From: Jacek Kalwas Date: Wed, 1 Sep 2021 05:47:10 -0400 Subject: [PATCH] module/bdev/nvme: return nvme ns as a module ctx instead nvme ctrlr It is more flexible now as it is possible to get nvme ns handle to do additional management or queries, however if nvme ctrlr handle is needed there is already public nvme API for that with nvme ns as an input. Signed-off-by: Jacek Kalwas Change-Id: I5493168ad31cc95687962288d57fb5457f2d7dd6 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9357 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Shuhei Matsumoto --- module/bdev/nvme/bdev_nvme.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index ec2d3b03d..72b8a9048 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -1163,7 +1163,11 @@ bdev_nvme_get_module_ctx(void *ctx) { struct nvme_bdev *nvme_bdev = ctx; - return bdev_nvme_get_ctrlr(&nvme_bdev->disk); + if (!nvme_bdev || nvme_bdev->disk.module != &nvme_if || !nvme_bdev->nvme_ns) { + return NULL; + } + + return nvme_bdev->nvme_ns->ns; } static const char *