Commit 1a1e0743 authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

bdev/nvme: add nvme_ctrlr_ prefix to aer_cb 



Most functions taking nvme_ctrlr as an argument has this prefix, it
helps with readability.

Change-Id: I5247ad461595d685653f8370763c2609da50757e
Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26943


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
parent 10ea1659

module/bdev/nvme/bdev_nvme.c

+2 −2
Original line number Diff line number Diff line
@@ -5723,7 +5723,7 @@ exit: 
}



static void

aer_cb(void *arg, const struct spdk_nvme_cpl *cpl)

nvme_ctrlr_aer_cb(void *arg, const struct spdk_nvme_cpl *cpl)

{

	struct nvme_ctrlr *nvme_ctrlr		= arg;

	union spdk_nvme_async_event_completion	event;
@@ -5805,7 +5805,7 @@ nvme_ctrlr_create_done(struct nvme_ctrlr *nvme_ctrlr, 


	/* AER callback is registered late to prevent getting the I/O channel

	 * on an unregistered controller during namespace population. */

	spdk_nvme_ctrlr_register_aer_callback(nvme_ctrlr->ctrlr, aer_cb, nvme_ctrlr);

	spdk_nvme_ctrlr_register_aer_callback(nvme_ctrlr->ctrlr, nvme_ctrlr_aer_cb, nvme_ctrlr);



	/* Populate namespaces for the first time. */

	nvme_ctrlr_populate_namespaces(nvme_ctrlr, ctx);

test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c

+3 −3
Original line number Diff line number Diff line
@@ -2296,7 +2296,7 @@ test_aer_cb(void) 
	event.bits.async_event_info = SPDK_NVME_ASYNC_EVENT_NS_ATTR_CHANGED;

	cpl.cdw0 = event.raw;



	aer_cb(nvme_ctrlr, &cpl);

	nvme_ctrlr_aer_cb(nvme_ctrlr, &cpl);



	CU_ASSERT(nvme_ctrlr_get_ns(nvme_ctrlr, 1) != NULL);

	CU_ASSERT(nvme_ctrlr_get_ns(nvme_ctrlr, 2) != NULL);
@@ -2313,7 +2313,7 @@ test_aer_cb(void) 
	event.bits.async_event_info = SPDK_NVME_ASYNC_EVENT_ANA_CHANGE;

	cpl.cdw0 = event.raw;



	aer_cb(nvme_ctrlr, &cpl);

	nvme_ctrlr_aer_cb(nvme_ctrlr, &cpl);



	spdk_delay_us(g_opts.nvme_adminq_poll_period_us);

	poll_threads();
@@ -7746,7 +7746,7 @@ test_ns_remove_during_reset(void) 
	event.bits.async_event_info = SPDK_NVME_ASYNC_EVENT_NS_ATTR_CHANGED;

	cpl.cdw0 = event.raw;



	aer_cb(nvme_ctrlr, &cpl);

	nvme_ctrlr_aer_cb(nvme_ctrlr, &cpl);



	CU_ASSERT(nvme_ns == nvme_ctrlr_get_first_active_ns(nvme_ctrlr));

	CU_ASSERT(nbdev == nvme_bdev_ctrlr_get_bdev(nbdev_ctrlr, 1));