Commit 789055ca authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Remove namespace types 



There's only one type now.

Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Change-Id: I8fbf330797e772b1c45a04970c95bf4894c26639
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9348


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent dcc2a96a

module/bdev/nvme/bdev_nvme.c

+1 −6
Original line number Diff line number Diff line
@@ -1769,7 +1769,7 @@ nvme_ctrlr_populate_namespaces(struct nvme_ctrlr *nvme_ctrlr, 
		nvme_ns = nvme_ctrlr->namespaces[i];

		ns_is_active = spdk_nvme_ctrlr_is_active_ns(ctrlr, nsid);



		if (nvme_ns->populated && ns_is_active && nvme_ns->type == NVME_NS_STANDARD) {

		if (nvme_ns->populated && ns_is_active) {

			/* NS is still there but attributes may have changed */

			ns = spdk_nvme_ctrlr_get_ns(ctrlr, nsid);

			num_sectors = spdk_nvme_ns_get_num_sectors(ns);
@@ -1792,7 +1792,6 @@ nvme_ctrlr_populate_namespaces(struct nvme_ctrlr *nvme_ctrlr, 
		if (!nvme_ns->populated && ns_is_active) {

			nvme_ns->id = nsid;

			nvme_ns->ctrlr = nvme_ctrlr;

			nvme_ns->type = NVME_NS_STANDARD;



			nvme_ns->bdev = NULL;
@@ -2384,10 +2383,6 @@ nvme_ctrlr_populate_namespaces_done(struct nvme_ctrlr *nvme_ctrlr, 
		}

		assert(nvme_ns->id == nsid);

		nvme_bdev = nvme_ns->bdev;

		if (nvme_bdev == NULL) {

			assert(nvme_ns->type == NVME_NS_OCSSD);

			continue;

		}

		if (j < ctx->count) {

			ctx->names[j] = nvme_bdev->disk.name;

			j++;

module/bdev/nvme/common.h

+0 −7
Original line number Diff line number Diff line
@@ -65,15 +65,8 @@ struct nvme_async_probe_ctx { 
	bool namespaces_populated;

};



enum nvme_ns_type {

	NVME_NS_UNKNOWN		= 0,

	NVME_NS_STANDARD	= 1,

	NVME_NS_OCSSD		= 2,

};



struct nvme_ns {

	uint32_t		id;

	enum nvme_ns_type	type;

	/** Marks whether this data structure has its bdevs

	 *  populated for the associated namespace.  It is used

	 *  to keep track if we need manage the populated