Commit 1bbefed6 authored by Kozlowski Mateusz's avatar Kozlowski Mateusz Committed by Jim Harris
Browse files

FTL: Remove leftover ZNS code 



Signed-off-by: default avatarKozlowski Mateusz <mateusz.kozlowski@intel.com>
Change-Id: Ica358805a69582d78e0d6c4f17b5a97ff38e44ca
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14112


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent c746637d

include/spdk/ftl.h

+0 −4
Original line number Diff line number Diff line
@@ -54,10 +54,6 @@ struct spdk_ftl_attrs { 
	uint64_t			num_blocks;

	/* Logical block size */

	uint64_t			block_size;

	/* Number of zones in the underlying device (including any offline ones) */

	uint64_t			num_zones;

	/* Number of logical blocks per zone */

	uint64_t			zone_size;

	/* Optimal IO size - bdev layer will split requests over this size */

	uint64_t			optimum_io_size;

};

lib/ftl/ftl_core.c

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ spdk_ftl_dev_get_attrs(const struct spdk_ftl_dev *dev, struct spdk_ftl_attrs *at 
{

	attrs->num_blocks = dev->num_lbas;

	attrs->block_size = FTL_BLOCK_SIZE;

	attrs->num_zones = ftl_get_num_zones(dev);

	attrs->zone_size = ftl_get_num_blocks_in_zone(dev);

	attrs->optimum_io_size = dev->xfer_size;

}

lib/ftl/ftl_core.h

+0 −21
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include "spdk/queue.h"

#include "spdk/ftl.h"

#include "spdk/bdev.h"

#include "spdk/bdev_zone.h"



#include "ftl_internal.h"

#include "ftl_io.h"
@@ -49,8 +48,6 @@ struct spdk_ftl_dev { 


	/* Cached properties of the underlying device */

	uint64_t			num_blocks_in_band;

	uint64_t			num_zones_in_band;

	uint64_t			num_blocks_in_zone;

	bool				is_zoned;



	/* Indicates the device is fully initialized */
@@ -130,18 +127,6 @@ ftl_get_num_blocks_in_band(const struct spdk_ftl_dev *dev) 
	return dev->num_blocks_in_band;

}



static inline size_t

ftl_get_num_zones_in_band(const struct spdk_ftl_dev *dev)

{

	return dev->num_zones_in_band;

}



static inline size_t

ftl_get_num_blocks_in_zone(const struct spdk_ftl_dev *dev)

{

	return dev->num_blocks_in_zone;

}



static inline uint32_t

ftl_get_write_unit_size(struct spdk_bdev *bdev)

{
@@ -165,12 +150,6 @@ ftl_get_num_bands(const struct spdk_ftl_dev *dev) 
	return dev->num_bands;

}



static inline size_t

ftl_get_num_zones(const struct spdk_ftl_dev *dev)

{

	return ftl_get_num_bands(dev) * ftl_get_num_zones_in_band(dev);

}



static inline bool

ftl_check_core_thread(const struct spdk_ftl_dev *dev)

{

lib/ftl/ftl_init.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include "spdk/ftl.h"

#include "spdk/likely.h"

#include "spdk/string.h"

#include "spdk/bdev_zone.h"

#include "spdk/bdev_module.h"

#include "spdk/config.h"

lib/ftl/ftl_io.h

+0 −6
Original line number Diff line number Diff line
@@ -219,9 +219,6 @@ struct ftl_rq { 
		/* Request physical address, on IO completion set for append device */

		ftl_addr addr;



		/* Zone to which IO is issued */

		struct ftl_zone *zone;



		struct spdk_bdev_io_wait_entry bdev_io_wait;

	} io;
@@ -261,9 +258,6 @@ struct ftl_basic_rq { 
		/* Request physical address, on IO completion set for append device */

		ftl_addr addr;



		/* Zone to which IO is issued */

		struct ftl_zone *zone;



		/* Chunk to which IO is issued */

		struct ftl_nv_cache_chunk *chunk;