Commit 7501235a authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

bdev/nvme: rename 'active' flag to 'populated' 



This will better match the recent renaming to the
functions associated with this flag.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ia7a0f3a50ae59b1d76d66443c91a98dc576f4d09

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475796


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 62db72ca

module/bdev/nvme/bdev_nvme.c

+7 −7
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ nvme_ctrlr_deactivate_namespace(struct nvme_bdev_ns *ns) 
		spdk_bdev_unregister(&bdev->disk, NULL, NULL);

	}



	ns->active = false;

	ns->populated = false;

}



static void
@@ -1044,7 +1044,7 @@ nvme_ctrlr_populate_namespaces(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr) 
		uint32_t	nsid = i + 1;



		ns = nvme_bdev_ctrlr->namespaces[i];

		if (!ns->active && spdk_nvme_ctrlr_is_active_ns(ctrlr, nsid)) {

		if (!ns->populated && spdk_nvme_ctrlr_is_active_ns(ctrlr, nsid)) {

			ns->id = nsid;

			ns->ctrlr = nvme_bdev_ctrlr;

			if (spdk_nvme_ctrlr_is_ocssd_supported(ctrlr)) {
@@ -1057,13 +1057,13 @@ nvme_ctrlr_populate_namespaces(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr) 


			rc = nvme_ctrlr_populate_namespace(nvme_bdev_ctrlr, ns);

			if (rc == 0) {

				ns->active = true;

				ns->populated = true;

			} else {

				memset(ns, 0, sizeof(*ns));

			}

		}



		if (ns->active && !spdk_nvme_ctrlr_is_active_ns(ctrlr, nsid)) {

		if (ns->populated && !spdk_nvme_ctrlr_is_active_ns(ctrlr, nsid)) {

			nvme_ctrlr_deactivate_namespace(ns);

		}

	}
@@ -1225,9 +1225,9 @@ remove_cb(void *cb_ctx, struct spdk_nvme_ctrlr *ctrlr) 
				uint32_t	nsid = i + 1;



				ns = nvme_bdev_ctrlr->namespaces[nsid - 1];

				if (ns->active) {

				if (ns->populated) {

					assert(ns->id == nsid);

					ns->active = false;

					ns->populated = false;

					TAILQ_FOREACH_SAFE(nvme_bdev, &ns->bdevs, tailq, tmp) {

						spdk_bdev_unregister(&nvme_bdev->disk, NULL, NULL);

					}
@@ -1378,7 +1378,7 @@ bdev_nvme_populate_namespaces(struct nvme_async_probe_ctx *ctx, spdk_bdev_create 
	for (i = 0; i < nvme_bdev_ctrlr->num_ns; i++) {

		nsid = i + 1;

		ns = nvme_bdev_ctrlr->namespaces[nsid - 1];

		if (!ns->active) {

		if (!ns->populated) {

			continue;

		}

		assert(ns->id == nsid);

module/bdev/nvme/common.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ enum nvme_bdev_ns_type { 
struct nvme_bdev_ns {

	uint32_t		id;

	enum nvme_bdev_ns_type	type;

	bool			active;

	bool			populated;

	struct spdk_nvme_ns	*ns;

	struct nvme_bdev_ctrlr	*ctrlr;

	TAILQ_HEAD(, nvme_bdev)	bdevs;