From 2bed9983e2daa36ec3e5d3ac12cee9df8d47bec9 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 29 Mar 2021 23:57:03 +0900 Subject: [PATCH] bdev/nvme: Merge clearing nvme_ns->populated into nvme_ctrlr_depopulate_namespace_done() Merge setting nvme_ns->populated to false into nvme_ctrlr_depopulate_namespace_done(). This will simplify the further changes. Signed-off-by: Shuhei Matsumoto Change-Id: I4bb8347b085ec5855690f6dbde243269cedee706 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7136 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Paul Luse Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk --- module/bdev/nvme/bdev_nvme.c | 2 -- module/bdev/nvme/bdev_ocssd.c | 2 -- module/bdev/nvme/common.c | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 4eb949544..e1eb31e8d 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -1539,8 +1539,6 @@ nvme_ctrlr_depopulate_standard_namespace(struct nvme_bdev_ns *nvme_ns) spdk_bdev_unregister(&bdev->disk, NULL, NULL); } - nvme_ns->populated = false; - nvme_ctrlr_depopulate_namespace_done(nvme_ns); } diff --git a/module/bdev/nvme/bdev_ocssd.c b/module/bdev/nvme/bdev_ocssd.c index bb227e348..54952f1d4 100644 --- a/module/bdev/nvme/bdev_ocssd.c +++ b/module/bdev/nvme/bdev_ocssd.c @@ -906,8 +906,6 @@ bdev_ocssd_free_namespace(struct nvme_bdev_ns *nvme_ns) free(nvme_ns->type_ctx); nvme_ns->type_ctx = NULL; - nvme_ns->populated = false; - nvme_ctrlr_depopulate_namespace_done(nvme_ns); } diff --git a/module/bdev/nvme/common.c b/module/bdev/nvme/common.c index ee4e3bf16..eceeaa692 100644 --- a/module/bdev/nvme/common.c +++ b/module/bdev/nvme/common.c @@ -194,6 +194,9 @@ nvme_ctrlr_depopulate_namespace_done(struct nvme_bdev_ns *nvme_ns) assert(nvme_bdev_ctrlr != NULL); pthread_mutex_lock(&nvme_bdev_ctrlr->mutex); + + nvme_ns->populated = false; + assert(nvme_ns->ref > 0); nvme_ns->ref--; if (nvme_ns->ref > 0) {