Commit 229b9968 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/ocssd: Removed unused ioch parameter from bdev_ocssd_get_zone_info() 



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


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: Mellanox Build Bot
parent e9e9053a

module/bdev/nvme/bdev_ocssd.c

+2 −2
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ _bdev_ocssd_get_zone_info(struct spdk_bdev_io *bdev_io) 
}



static int

bdev_ocssd_get_zone_info(struct spdk_io_channel *ioch, struct spdk_bdev_io *bdev_io)

bdev_ocssd_get_zone_info(struct spdk_bdev_io *bdev_io)

{

	struct bdev_ocssd_io *ocdev_io = (struct bdev_ocssd_io *)bdev_io->driver_ctx;
@@ -753,7 +753,7 @@ _bdev_ocssd_submit_request(struct spdk_io_channel *ioch, struct spdk_bdev_io *bd 
		return bdev_ocssd_zone_management(ioch, bdev_io);



	case SPDK_BDEV_IO_TYPE_GET_ZONE_INFO:

		return bdev_ocssd_get_zone_info(ioch, bdev_io);

		return bdev_ocssd_get_zone_info(bdev_io);



	case SPDK_BDEV_IO_TYPE_ZONE_APPEND:

		return bdev_ocssd_zone_append(ioch, bdev_io);

test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c

+6 −6
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ test_get_zone_info(void) 
	set_chunk_state(chunk_info, CHUNK_STATE_FREE);

	chunk_info->wp = 0;



	rc = bdev_ocssd_get_zone_info(NULL, bdev_io);

	rc = bdev_ocssd_get_zone_info(bdev_io);

	CU_ASSERT_EQUAL(rc, 0);



	CU_ASSERT_EQUAL(zone_info[0].state, SPDK_BDEV_ZONE_STATE_EMPTY);
@@ -1078,7 +1078,7 @@ test_get_zone_info(void) 
	chunk_info->cnlb = 511;

	chunk_info->ct.size_deviate = 1;



	rc = bdev_ocssd_get_zone_info(NULL, bdev_io);

	rc = bdev_ocssd_get_zone_info(bdev_io);

	CU_ASSERT_EQUAL(rc, 0);



	CU_ASSERT_EQUAL(zone_info[0].state, SPDK_BDEV_ZONE_STATE_OPEN);
@@ -1094,7 +1094,7 @@ test_get_zone_info(void) 
	set_chunk_state(chunk_info, CHUNK_STATE_OFFLINE);

	chunk_info->wp = chunk_info->slba;



	rc = bdev_ocssd_get_zone_info(NULL, bdev_io);

	rc = bdev_ocssd_get_zone_info(bdev_io);

	CU_ASSERT_EQUAL(rc, 0);



	CU_ASSERT_EQUAL(zone_info[0].state, SPDK_BDEV_ZONE_STATE_OFFLINE);
@@ -1119,7 +1119,7 @@ test_get_zone_info(void) 
		chunk_info->ct.size_deviate = 0;

	}



	rc = bdev_ocssd_get_zone_info(NULL, bdev_io);

	rc = bdev_ocssd_get_zone_info(bdev_io);

	CU_ASSERT_EQUAL(rc, 0);



	for (offset = 0; offset < MAX_ZONE_INFO_COUNT; ++offset) {
@@ -1134,7 +1134,7 @@ test_get_zone_info(void) 
	bdev_io->u.zone_mgmt.num_zones = MAX_ZONE_INFO_COUNT;

	bdev_io->u.zone_mgmt.buf = &zone_info;



	rc = bdev_ocssd_get_zone_info(NULL, bdev_io);

	rc = bdev_ocssd_get_zone_info(bdev_io);

	CU_ASSERT_EQUAL(rc, -EINVAL);



	/* Verify correct NVMe error forwarding */
@@ -1144,7 +1144,7 @@ test_get_zone_info(void) 
	chunk_info = get_chunk_info(ctrlr, 0);

	set_chunk_state(chunk_info, CHUNK_STATE_FREE);



	rc = bdev_ocssd_get_zone_info(NULL, bdev_io);

	rc = bdev_ocssd_get_zone_info(bdev_io);

	CU_ASSERT_EQUAL(rc, 0);

	g_chunk_info_cpl = (struct spdk_nvme_cpl) {

		.status = {