Commit 974daa68 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Factor out creating NVMe bdev in nvme_ctrlr_populate_standard_namespace() 



In the following patches, nvme_bdev_subsystem will be added and nvme_bdev_ns
will be added to not nvme_bdev but nvme_bdev_subsystem.

To do it easier, factor out creating an NVMe bdev into an new helper
function nvme_bdev_create().

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ifa902912ba1ea979153b04ef4ac9fae10c09b7e2
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5018


Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 744414c0

module/bdev/nvme/bdev_nvme.c

+38 −21
Original line number Diff line number Diff line
@@ -1064,13 +1064,12 @@ static const struct spdk_bdev_fn_table nvmelib_fn_table = { 
	.get_spin_time		= bdev_nvme_get_spin_time,

};



static void

nvme_ctrlr_populate_standard_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,

				       struct nvme_bdev_ns *nvme_ns, struct nvme_async_probe_ctx *ctx)

static struct nvme_bdev *

nvme_bdev_create(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_ns *nvme_ns)

{

	struct spdk_nvme_ctrlr	*ctrlr = nvme_bdev_ctrlr->ctrlr;

	struct nvme_bdev		*bdev;

	struct spdk_nvme_ns	*ns;

	struct spdk_nvme_ctrlr		*ctrlr = nvme_bdev_ctrlr->ctrlr;

	struct spdk_nvme_ns		*ns = nvme_ns->ns;

	const struct spdk_uuid		*uuid;

	const struct spdk_nvme_ctrlr_data *cdata;

	const struct spdk_nvme_ns_data	*nsdata;
@@ -1078,28 +1077,18 @@ nvme_ctrlr_populate_standard_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, 


	cdata = spdk_nvme_ctrlr_get_data(ctrlr);



	ns = spdk_nvme_ctrlr_get_ns(ctrlr, nvme_ns->id);

	if (!ns) {

		SPDK_DEBUGLOG(bdev_nvme, "Invalid NS %d\n", nvme_ns->id);

		rc = -EINVAL;

		goto done;

	}



	bdev = calloc(1, sizeof(*bdev));

	if (!bdev) {

		SPDK_ERRLOG("bdev calloc() failed\n");

		rc = -ENOMEM;

		goto done;

		return NULL;

	}



	nvme_ns->ns = ns;

	bdev->nvme_ns = nvme_ns;



	bdev->disk.name = spdk_sprintf_alloc("%sn%d", nvme_bdev_ctrlr->name, spdk_nvme_ns_get_id(ns));

	if (!bdev->disk.name) {

		free(bdev);

		rc = -ENOMEM;

		goto done;

		return NULL;

	}

	bdev->disk.product_name = "NVMe disk";
@@ -1142,8 +1131,36 @@ nvme_ctrlr_populate_standard_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, 
	bdev->disk.module = &nvme_if;

	rc = spdk_bdev_register(&bdev->disk);

	if (rc) {

		SPDK_ERRLOG("spdk_bdev_register() failed\n");

		free(bdev->disk.name);

		free(bdev);

		return NULL;

	}



	return bdev;

}



static void

nvme_ctrlr_populate_standard_namespace(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr,

				       struct nvme_bdev_ns *nvme_ns, struct nvme_async_probe_ctx *ctx)

{

	struct nvme_bdev	*bdev;

	struct spdk_nvme_ctrlr	*ctrlr = nvme_bdev_ctrlr->ctrlr;

	struct spdk_nvme_ns	*ns;

	int			rc = 0;



	ns = spdk_nvme_ctrlr_get_ns(ctrlr, nvme_ns->id);

	if (!ns) {

		SPDK_DEBUGLOG(bdev_nvme, "Invalid NS %d\n", nvme_ns->id);

		rc = -EINVAL;

		goto done;

	}



	nvme_ns->ns = ns;



	bdev = nvme_bdev_create(nvme_bdev_ctrlr, nvme_ns);

	if (!bdev) {

		rc = -ENOMEM;

		goto done;

	}