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

iscsi: allocate sessions array using regular calloc

Browse Source 
spdk_dma_malloc() is not required here, as the session
array is nether DMA-able nor shared between processes.

Change-Id: Ia9218d00eea8a3207abf07c1d78eaa585ffcad2c
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/450552
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Darek Stojaczyk 2019-04-08 23:51:12 +02:00 committed by Changpeng Liu
parent a50100900d
commit 5bf0a3838c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/iscsi/iscsi_subsystem.c
View File

@ -1291,9 +1291,9 @@ iscsi_parse_globals(void)
return rc; return rc;
} }
g_spdk_iscsi.session = spdk_dma_zmalloc(sizeof(void *) * g_spdk_iscsi.MaxSessions, 0, NULL); g_spdk_iscsi.session = calloc(1, sizeof(void *) * g_spdk_iscsi.MaxSessions);
if (!g_spdk_iscsi.session) { if (!g_spdk_iscsi.session) {
SPDK_ERRLOG("spdk_dma_zmalloc() failed for session array\n"); SPDK_ERRLOG("calloc() failed for session array\n");
return -1; return -1;
} }
@ -1308,12 +1308,14 @@ iscsi_parse_globals(void)
rc = iscsi_initialize_all_pools(); rc = iscsi_initialize_all_pools();
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("spdk_initialize_all_pools() failed\n"); SPDK_ERRLOG("spdk_initialize_all_pools() failed\n");
free(g_spdk_iscsi.session);
return -1; return -1;
} }
rc = spdk_initialize_iscsi_conns(); rc = spdk_initialize_iscsi_conns();
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("spdk_initialize_iscsi_conns() failed\n"); SPDK_ERRLOG("spdk_initialize_iscsi_conns() failed\n");
free(g_spdk_iscsi.session);
return rc; return rc;
} }
@ -1351,6 +1353,7 @@ spdk_iscsi_fini(spdk_iscsi_fini_cb cb_fn, void *cb_arg)
spdk_iscsi_portal_grp_close_all(); spdk_iscsi_portal_grp_close_all();
spdk_shutdown_iscsi_conns(); spdk_shutdown_iscsi_conns();
free(g_spdk_iscsi.session);
} }
static void static void