ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: remove nvme_ctrlr_init_ana_log_page function

Browse Source 
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: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13652
Community-CI: Mellanox Build Bot
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Dong Yi <dongx.yi@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Changpeng Liu 2022-07-13 12:21:02 +08:00 committed by Konrad Sztyber
parent a70a338f5a
commit 673c8a65e1
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/nvme/nvme_ctrlr.c
View File

@ -789,19 +789,6 @@ nvme_ctrlr_update_ana_log_page(struct spdk_nvme_ctrlr *ctrlr)
return 0; 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 static int
nvme_ctrlr_update_ns_ana_states(const struct spdk_nvme_ana_group_descriptor *desc, nvme_ctrlr_update_ns_ana_states(const struct spdk_nvme_ana_group_descriptor *desc,
void *cb_arg) void *cb_arg)
@ -878,7 +865,7 @@ nvme_ctrlr_set_supported_log_pages(struct spdk_nvme_ctrlr *ctrlr)
if (ctrlr->cdata.cmic.ana_reporting) { if (ctrlr->cdata.cmic.ana_reporting) {
ctrlr->log_page_supported[SPDK_NVME_LOG_ASYMMETRIC_NAMESPACE_ACCESS] = true; ctrlr->log_page_supported[SPDK_NVME_LOG_ASYMMETRIC_NAMESPACE_ACCESS] = true;
if (!ctrlr->opts.disable_read_ana_log_page) { 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) { if (rc == 0) {
nvme_ctrlr_parse_ana_log_page(ctrlr, nvme_ctrlr_update_ns_ana_states, nvme_ctrlr_parse_ana_log_page(ctrlr, nvme_ctrlr_update_ns_ana_states,
ctrlr); ctrlr);

2
test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
View File

@ -3116,7 +3116,7 @@ test_nvme_ctrlr_parse_ana_log_page(void)
ctrlr.cdata.nanagrpid = 3; ctrlr.cdata.nanagrpid = 3;
ctrlr.active_ns_count = 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(rc == 0);
CU_ASSERT(ctrlr.ana_log_page != NULL); CU_ASSERT(ctrlr.ana_log_page != NULL);
CU_ASSERT(ctrlr.copied_ana_desc != NULL); CU_ASSERT(ctrlr.copied_ana_desc != NULL);