Commit 26f3b551 authored by Mateusz Kozlowski's avatar Mateusz Kozlowski Committed by Tomasz Zawadzki
Browse files

lib/ftl: rename ftl_nv_cache_device_desc to ftl_nv_cache_device_type 



This should align the change to the base device naming.

Change-Id: I0396bb2f5a2057ea65c03d8c3e8981fe84c42797
Signed-off-by: default avatarMateusz Kozlowski <mateusz.kozlowski@solidigm.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/20861


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

lib/ftl/ftl_layout.c

+2 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int 
layout_region_create_nvc(struct spdk_ftl_dev *dev, enum ftl_layout_region_type reg_type,

			 uint32_t reg_version, size_t entry_size, size_t entry_count)

{

	const struct ftl_md_layout_ops *md_ops = &dev->nv_cache.nvc_desc->ops.md_layout_ops;

	const struct ftl_md_layout_ops *md_ops = &dev->nv_cache.nvc_type->ops.md_layout_ops;

	size_t reg_blks = ftl_md_region_blocks(dev, entry_count * entry_size);



	if (md_ops->region_create(dev, reg_type, reg_version, reg_blks)) {
@@ -266,7 +266,7 @@ legacy_layout_region_open_nvc(struct spdk_ftl_dev *dev, enum ftl_layout_region_t 
			      uint32_t reg_version, size_t entry_size, size_t entry_count)

{

	struct ftl_layout_region *reg = &dev->layout.region[reg_type];

	const struct ftl_md_layout_ops *md_ops = &dev->nv_cache.nvc_desc->ops.md_layout_ops;

	const struct ftl_md_layout_ops *md_ops = &dev->nv_cache.nvc_type->ops.md_layout_ops;



	legacy_layout_verify_region(dev->nvc_layout_tracker, reg_type, reg_version);

	return md_ops->region_open(dev, reg_type, reg_version, entry_size, entry_count, reg);

lib/ftl/ftl_nv_cache.c

+1 −1
Original line number Diff line number Diff line
@@ -2394,7 +2394,7 @@ ftl_property_dump_cache_dev(struct spdk_ftl_dev *dev, const struct ftl_property 
	uint64_t i;

	struct ftl_nv_cache_chunk *chunk;



	spdk_json_write_named_string(w, "type", dev->nv_cache.nvc_desc->name);

	spdk_json_write_named_string(w, "type", dev->nv_cache.nvc_type->name);

	spdk_json_write_named_array_begin(w, "chunks");

	for (i = 0, chunk = dev->nv_cache.chunks; i < dev->nv_cache.chunk_count; i++, chunk++) {

		spdk_json_write_object_begin(w);

lib/ftl/ftl_nv_cache.h

+2 −2
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ struct ftl_nv_cache { 
	/* Flag indicating halt request */

	bool halt;



	/* NV cache device descriptor */

	const struct ftl_nv_cache_device_desc *nvc_desc;

	/* NV cache device type */

	const struct ftl_nv_cache_device_type *nvc_type;



	/* Write buffer cache bdev */

	struct spdk_bdev_desc *bdev_desc;

lib/ftl/mngt/ftl_mngt_bdev.c

+5 −6
Original line number Diff line number Diff line
@@ -212,15 +212,14 @@ ftl_mngt_open_cache_bdev(struct spdk_ftl_dev *dev, struct ftl_mngt_process *mngt 
	}

	nv_cache->md_size = spdk_bdev_get_md_size(bdev);



	/* Get FTL NVC bdev descriptor */

	nv_cache->nvc_desc = ftl_nv_cache_device_get_desc_by_bdev(dev, bdev);

	if (!nv_cache->nvc_desc) {

		FTL_ERRLOG(dev, "Failed to get NV Cache device descriptor\n");

	nv_cache->nvc_type = ftl_nv_cache_device_get_type_by_bdev(dev, bdev);

	if (!nv_cache->nvc_type) {

		FTL_ERRLOG(dev, "Failed to get NV Cache device type\n");

		goto error;

	}

	nv_cache->md_size = sizeof(union ftl_md_vss);



	md_ops = &nv_cache->nvc_desc->ops.md_layout_ops;

	md_ops = &nv_cache->nvc_type->ops.md_layout_ops;

	if (!md_ops->region_create) {

		FTL_ERRLOG(dev, "NV Cache device doesn't implement md_layout_ops\n");

		goto error;
@@ -232,7 +231,7 @@ ftl_mngt_open_cache_bdev(struct spdk_ftl_dev *dev, struct ftl_mngt_process *mngt 
		goto error;

	}



	FTL_NOTICELOG(dev, "Using %s as NV Cache device\n", nv_cache->nvc_desc->name);

	FTL_NOTICELOG(dev, "Using %s as NV Cache device\n", nv_cache->nvc_type->name);

	ftl_mngt_next_step(mngt);

	return;

error:

lib/ftl/mngt/ftl_mngt_md.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ ftl_mngt_init_default_sb(struct spdk_ftl_dev *dev, struct ftl_mngt_process *mngt 
			SPDK_COUNTOF(sb->base_dev_name), '\0');

	sb->md_layout_base.df_id = FTL_DF_OBJ_ID_INVALID;



	spdk_strcpy_pad(sb->nvc_dev_name, dev->nv_cache.nvc_desc->name,

	spdk_strcpy_pad(sb->nvc_dev_name, dev->nv_cache.nvc_type->name,

			SPDK_COUNTOF(sb->nvc_dev_name), '\0');

	sb->md_layout_nvc.df_id = FTL_DF_OBJ_ID_INVALID;