Commit 5924e9ab authored by Karl Bonde Torp's avatar Karl Bonde Torp Committed by Konrad Sztyber
Browse files

bdev/nvme: add spdk_bdev_nvme_ctrlr_opts to nvme_disk_create 



Including the spdk_bdev_nvme_ctrlr_opts allows for accessing
bdev_nvme-specific options set in the bdev_nvme_attach_controller rpc,
without having to modify the function signature

Change-Id: I38a65588b722c73dd089619f16d0c725c98559b4
Signed-off-by: default avatarKarl Bonde Torp <k.torp@samsung.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24455


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 60241941

module/bdev/nvme/bdev_nvme.c

+3 −3
Original line number Diff line number Diff line
@@ -4087,7 +4087,7 @@ nvme_generate_uuid(const char *sn, uint32_t nsid, struct spdk_uuid *uuid) 
static int

nvme_disk_create(struct spdk_bdev *disk, const char *base_name,

		 struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_ns *ns,

		 uint32_t prchk_flags, void *ctx)

		 struct spdk_bdev_nvme_ctrlr_opts *bdev_opts, void *ctx)

{

	const struct spdk_uuid		*uuid;

	const uint8_t *nguid;
@@ -4203,7 +4203,7 @@ nvme_disk_create(struct spdk_bdev *disk, const char *base_name, 
		disk->dif_type = (enum spdk_dif_type)spdk_nvme_ns_get_pi_type(ns);

		if (disk->dif_type != SPDK_DIF_DISABLE) {

			disk->dif_is_head_of_md = nsdata->dps.md_start;

			disk->dif_check_flags = prchk_flags;

			disk->dif_check_flags = bdev_opts->prchk_flags;

			disk->dif_pi_format = (enum spdk_dif_pi_format)spdk_nvme_ns_get_pi_format(ns);

		}

	}
@@ -4282,7 +4282,7 @@ nvme_bdev_create(struct nvme_ctrlr *nvme_ctrlr, struct nvme_ns *nvme_ns) 
	bdev->opal = nvme_ctrlr->opal_dev != NULL;



	rc = nvme_disk_create(&bdev->disk, nbdev_ctrlr->name, nvme_ctrlr->ctrlr,

			      nvme_ns->ns, nvme_ctrlr->opts.prchk_flags, bdev);

			      nvme_ns->ns, &nvme_ctrlr->opts, bdev);

	if (rc != 0) {

		SPDK_ERRLOG("Failed to create NVMe disk\n");

		nvme_bdev_free(bdev);