Commit f0f7005b authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvme: simplify nvme_ctrlr_configure_aer_done 



For error case, just set ctrlr->num_aers to 0, and
then the loop won't execute at all.  This avoids an
extra call to nvme_ctrlr_set_state() and simplifies
the code a bit.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Iff7bbf6e03d18b5f553b9e8527b4c803db583917
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10330


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 avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 1c083e62

lib/nvme/nvme_ctrlr.c

+4 −6
Original line number Diff line number Diff line
@@ -3192,13 +3192,11 @@ nvme_ctrlr_configure_aer_done(void *arg, const struct spdk_nvme_cpl *cpl) 


	if (spdk_nvme_cpl_is_error(cpl)) {

		NVME_CTRLR_NOTICELOG(ctrlr, "nvme_ctrlr_configure_aer failed!\n");

		nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_SET_SUPPORTED_LOG_PAGES,

				     ctrlr->opts.admin_timeout_ms);

		return;

	}



		ctrlr->num_aers = 0;

	} else {

		/* aerl is a zero-based value, so we need to add 1 here. */

		ctrlr->num_aers = spdk_min(NVME_MAX_ASYNC_EVENTS, (ctrlr->cdata.aerl + 1));

	}



	for (i = 0; i < ctrlr->num_aers; i++) {

		aer = &ctrlr->aer[i];