Commit 472b5869 authored by Mateusz Kozlowski's avatar Mateusz Kozlowski Committed by Tomasz Zawadzki
Browse files

lib/ftl: Remove unused parameter from ftl_nv_cache_bdev_write/read_blocks_with_md 



We're no longer looking at the argument, so just remove it.

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


Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Reviewed-by: default avatarWojciech Malikowski <wojciech.malikowski@solidigm.com>
Community-CI: Mellanox Build Bot
parent 0f9b2850

lib/ftl/ftl_l2p_cache.c

+4 −5
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ process_page_in(struct ftl_l2p_page *page, spdk_bdev_io_completion_cb cb) 


	assert(page->page_buffer);



	rc = ftl_nv_cache_bdev_read_blocks_with_md(cache->dev, ftl_l2p_cache_get_bdev_desc(cache),

	rc = ftl_nv_cache_bdev_read_blocks_with_md(ftl_l2p_cache_get_bdev_desc(cache),

			ftl_l2p_cache_get_bdev_iochannel(cache),

			page->page_buffer, NULL, ftl_l2p_cache_page_get_bdev_offset(cache, page),

			1, cb, page);
@@ -630,12 +630,11 @@ process_page_out(struct ftl_l2p_page *page, spdk_bdev_io_completion_cb cb) 
	struct spdk_bdev *bdev;

	struct spdk_bdev_io_wait_entry *bdev_io_wait;

	struct ftl_l2p_cache *cache = page->ctx.cache;

	struct spdk_ftl_dev *dev = cache->dev;

	int rc;



	assert(page->page_buffer);



	rc = ftl_nv_cache_bdev_write_blocks_with_md(dev, ftl_l2p_cache_get_bdev_desc(cache),

	rc = ftl_nv_cache_bdev_write_blocks_with_md(ftl_l2p_cache_get_bdev_desc(cache),

			ftl_l2p_cache_get_bdev_iochannel(cache),

			page->page_buffer, NULL, ftl_l2p_cache_page_get_bdev_offset(cache, page),

			1, cb, page);
@@ -1253,7 +1252,7 @@ page_in_io(struct spdk_ftl_dev *dev, struct ftl_l2p_cache *cache, struct ftl_l2p 
	int rc;

	page->ctx.cache = cache;



	rc = ftl_nv_cache_bdev_read_blocks_with_md(cache->dev, ftl_l2p_cache_get_bdev_desc(cache),

	rc = ftl_nv_cache_bdev_read_blocks_with_md(ftl_l2p_cache_get_bdev_desc(cache),

			ftl_l2p_cache_get_bdev_iochannel(cache),

			page->page_buffer, NULL, ftl_l2p_cache_page_get_bdev_offset(cache, page),

			1, page_in_io_cb, page);
@@ -1438,7 +1437,7 @@ page_out_io(struct spdk_ftl_dev *dev, struct ftl_l2p_cache *cache, 


	page->ctx.cache = cache;



	rc = ftl_nv_cache_bdev_write_blocks_with_md(dev, ftl_l2p_cache_get_bdev_desc(cache),

	rc = ftl_nv_cache_bdev_write_blocks_with_md(ftl_l2p_cache_get_bdev_desc(cache),

			ftl_l2p_cache_get_bdev_iochannel(cache),

			page->page_buffer, NULL, ftl_l2p_cache_page_get_bdev_offset(cache, page),

			1, page_out_io_cb, page);

lib/ftl/ftl_nv_cache.c

+3 −4
Original line number Diff line number Diff line
@@ -1334,7 +1334,7 @@ ftl_nv_cache_read(struct ftl_io *io, ftl_addr addr, uint32_t num_blocks, 


	assert(ftl_addr_in_nvc(io->dev, addr));



	rc = ftl_nv_cache_bdev_read_blocks_with_md(io->dev, nv_cache->bdev_desc, nv_cache->cache_ioch,

	rc = ftl_nv_cache_bdev_read_blocks_with_md(nv_cache->bdev_desc, nv_cache->cache_ioch,

			ftl_io_iovec_addr(io), NULL, ftl_addr_to_nvc_offset(io->dev, addr),

			num_blocks, cb, cb_arg);
@@ -1830,10 +1830,9 @@ _ftl_chunk_basic_rq_write(void *_brq) 
{

	struct ftl_basic_rq *brq = _brq;

	struct ftl_nv_cache *nv_cache = brq->io.chunk->nv_cache;

	struct spdk_ftl_dev *dev = SPDK_CONTAINEROF(nv_cache, struct spdk_ftl_dev, nv_cache);

	int rc;



	rc = ftl_nv_cache_bdev_write_blocks_with_md(dev, nv_cache->bdev_desc, nv_cache->cache_ioch,

	rc = ftl_nv_cache_bdev_write_blocks_with_md(nv_cache->bdev_desc, nv_cache->cache_ioch,

			brq->io_payload, NULL, brq->io.addr,

			brq->num_blocks, write_brq_end, brq);

	if (spdk_unlikely(rc)) {
@@ -1887,7 +1886,7 @@ ftl_chunk_basic_rq_read(struct ftl_nv_cache_chunk *chunk, struct ftl_basic_rq *b 
	brq->io.chunk = chunk;

	brq->success = false;



	rc = ftl_nv_cache_bdev_read_blocks_with_md(dev, nv_cache->bdev_desc, nv_cache->cache_ioch,

	rc = ftl_nv_cache_bdev_read_blocks_with_md(nv_cache->bdev_desc, nv_cache->cache_ioch,

			brq->io_payload, NULL, brq->io.addr, brq->num_blocks, read_brq_end, brq);



	if (spdk_likely(!rc)) {

lib/ftl/ftl_nv_cache_io.h

+2 −4
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ 
#include "ftl_core.h"



static inline int

ftl_nv_cache_bdev_read_blocks_with_md(struct spdk_ftl_dev *dev,

				      struct spdk_bdev_desc *desc,

ftl_nv_cache_bdev_read_blocks_with_md(struct spdk_bdev_desc *desc,

				      struct spdk_io_channel *ch,

				      void *buf, void *md,

				      uint64_t offset_blocks, uint64_t num_blocks,
@@ -28,8 +27,7 @@ ftl_nv_cache_bdev_read_blocks_with_md(struct spdk_ftl_dev *dev, 
}



static inline int

ftl_nv_cache_bdev_write_blocks_with_md(struct spdk_ftl_dev *dev,

				       struct spdk_bdev_desc *desc,

ftl_nv_cache_bdev_write_blocks_with_md(struct spdk_bdev_desc *desc,

				       struct spdk_io_channel *ch,

				       void *buf, void *md,

				       uint64_t offset_blocks, uint64_t num_blocks,

lib/ftl/utils/ftl_md.c

+2 −2
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ read_blocks(struct spdk_ftl_dev *dev, struct spdk_bdev_desc *desc, 
	    spdk_bdev_io_completion_cb cb, void *cb_arg)

{

	if (desc == dev->nv_cache.bdev_desc) {

		return ftl_nv_cache_bdev_read_blocks_with_md(dev, desc, ch, buf, md_buf,

		return ftl_nv_cache_bdev_read_blocks_with_md(desc, ch, buf, md_buf,

				offset_blocks, num_blocks,

				cb, cb_arg);

	} else if (md_buf) {
@@ -517,7 +517,7 @@ write_blocks(struct spdk_ftl_dev *dev, struct spdk_bdev_desc *desc, 
	     spdk_bdev_io_completion_cb cb, void *cb_arg)

{

	if (desc == dev->nv_cache.bdev_desc) {

		return ftl_nv_cache_bdev_write_blocks_with_md(dev, desc, ch, buf, md_buf,

		return ftl_nv_cache_bdev_write_blocks_with_md(desc, ch, buf, md_buf,

				offset_blocks, num_blocks,

				cb, cb_arg);

	} else if (md_buf) {