Commit 673c8a65 authored by Changpeng Liu's avatar Changpeng Liu Committed by Konrad Sztyber
Browse files

nvme: remove `nvme_ctrlr_init_ana_log_page` function 



The function `nvme_ctrlr_init_ana_log_page` is exactly
same with `nvme_ctrlr_update_ana_log_page`, so remove it.

Change-Id: I1ad51635f47cf95cfa6de217e3b9144885c3b74e
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13652


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarDong Yi <dongx.yi@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent a70a338f

lib/nvme/nvme_ctrlr.c

+1 −14
Original line number Diff line number Diff line
@@ -789,19 +789,6 @@ nvme_ctrlr_update_ana_log_page(struct spdk_nvme_ctrlr *ctrlr) 
	return 0;

}



static int

nvme_ctrlr_init_ana_log_page(struct spdk_nvme_ctrlr *ctrlr)

{

	int rc;



	rc = nvme_ctrlr_alloc_ana_log_page(ctrlr);

	if (rc) {

		return rc;

	}



	return nvme_ctrlr_update_ana_log_page(ctrlr);

}



static int

nvme_ctrlr_update_ns_ana_states(const struct spdk_nvme_ana_group_descriptor *desc,

				void *cb_arg)
@@ -878,7 +865,7 @@ nvme_ctrlr_set_supported_log_pages(struct spdk_nvme_ctrlr *ctrlr) 
	if (ctrlr->cdata.cmic.ana_reporting) {

		ctrlr->log_page_supported[SPDK_NVME_LOG_ASYMMETRIC_NAMESPACE_ACCESS] = true;

		if (!ctrlr->opts.disable_read_ana_log_page) {

			rc = nvme_ctrlr_init_ana_log_page(ctrlr);

			rc = nvme_ctrlr_update_ana_log_page(ctrlr);

			if (rc == 0) {

				nvme_ctrlr_parse_ana_log_page(ctrlr, nvme_ctrlr_update_ns_ana_states,

							      ctrlr);

test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -3116,7 +3116,7 @@ test_nvme_ctrlr_parse_ana_log_page(void) 
	ctrlr.cdata.nanagrpid = 3;

	ctrlr.active_ns_count = 3;



	rc = nvme_ctrlr_init_ana_log_page(&ctrlr);

	rc = nvme_ctrlr_update_ana_log_page(&ctrlr);

	CU_ASSERT(rc == 0);

	CU_ASSERT(ctrlr.ana_log_page != NULL);

	CU_ASSERT(ctrlr.copied_ana_desc != NULL);