Commit 3791dfc6 authored by Damiano Cipriani's avatar Damiano Cipriani Committed by Konrad Sztyber
Browse files

nvme: rename spdk_nvme_ctrlr_aer_completion_list 



The structure spdk_nvme_ctrlr_aer_completion_list has been renamed
to spdk_nvme_ctrlr_aer_completion, these structs go into a list but
aren't the list itself.

Change-Id: I7919b9a37860001349b9379821a8b6f2fef4a16e
Signed-off-by: default avatarDamiano Cipriani <damiano.cipriani@suse.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25168


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 952532af

lib/nvme/nvme_ctrlr.c

+4 −4
Original line number Diff line number Diff line
@@ -3285,7 +3285,7 @@ static void 
nvme_ctrlr_queue_async_event(struct spdk_nvme_ctrlr *ctrlr,

			     const struct spdk_nvme_cpl *cpl)

{

	struct  spdk_nvme_ctrlr_aer_completion_list *nvme_event;

	struct  spdk_nvme_ctrlr_aer_completion *nvme_event;

	struct spdk_nvme_ctrlr_process *proc;



	/* Add async event to each process objects event list */
@@ -3305,14 +3305,14 @@ nvme_ctrlr_queue_async_event(struct spdk_nvme_ctrlr *ctrlr, 
static void

nvme_ctrlr_complete_queued_async_events(struct spdk_nvme_ctrlr *ctrlr)

{

	struct  spdk_nvme_ctrlr_aer_completion_list  *nvme_event, *nvme_event_tmp;

	struct  spdk_nvme_ctrlr_aer_completion  *nvme_event, *nvme_event_tmp;

	struct spdk_nvme_ctrlr_process	*active_proc;



	active_proc = nvme_ctrlr_get_current_process(ctrlr);



	STAILQ_FOREACH_SAFE(nvme_event, &active_proc->async_events, link, nvme_event_tmp) {

		STAILQ_REMOVE(&active_proc->async_events, nvme_event,

			      spdk_nvme_ctrlr_aer_completion_list, link);

			      spdk_nvme_ctrlr_aer_completion, link);

		nvme_ctrlr_process_async_event(ctrlr, &nvme_event->cpl);

		spdk_free(nvme_event);
@@ -3556,7 +3556,7 @@ nvme_ctrlr_cleanup_process(struct spdk_nvme_ctrlr_process *proc) 
{

	struct nvme_request	*req, *tmp_req;

	struct spdk_nvme_qpair	*qpair, *tmp_qpair;

	struct spdk_nvme_ctrlr_aer_completion_list *event;

	struct spdk_nvme_ctrlr_aer_completion *event;



	STAILQ_FOREACH_SAFE(req, &proc->active_reqs, stailq, tmp_req) {

		STAILQ_REMOVE(&proc->active_reqs, req, nvme_request, stailq);

lib/nvme/nvme_internal.h

+3 −3
Original line number Diff line number Diff line
@@ -876,9 +876,9 @@ enum nvme_ctrlr_state { 
#define NVME_TIMEOUT_INFINITE		0

#define NVME_TIMEOUT_KEEP_EXISTING	UINT64_MAX



struct spdk_nvme_ctrlr_aer_completion_list {

struct spdk_nvme_ctrlr_aer_completion {

	struct spdk_nvme_cpl	cpl;

	STAILQ_ENTRY(spdk_nvme_ctrlr_aer_completion_list) link;

	STAILQ_ENTRY(spdk_nvme_ctrlr_aer_completion) link;

};



/*
@@ -918,7 +918,7 @@ struct spdk_nvme_ctrlr_process { 
	uint64_t			timeout_admin_ticks;



	/** List to publish AENs to all procs in multiprocess setup */

	STAILQ_HEAD(, spdk_nvme_ctrlr_aer_completion_list)      async_events;

	STAILQ_HEAD(, spdk_nvme_ctrlr_aer_completion)      async_events;

};



struct nvme_register_completion {