Commit 2bed9983 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

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: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent b1d6c2f3

module/bdev/nvme/bdev_nvme.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

}

module/bdev/nvme/bdev_ocssd.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

}

module/bdev/nvme/common.c

+3 −0
Original line number Diff line number Diff line
@@ -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) {