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

lib/iscsi: Remove the "spdk_" prefix from internal APIs declared in init_grp.h

Browse Source 
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I4f06612aa6e619371f28b2df435e0966d30da275
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1887
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Seth Howell <seth.howell@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-04-16 06:39:41 +09:00 committed by Tomasz Zawadzki
parent 6a31372511
commit df53885bc5
7 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/iscsi/init_grp.c
View File

@ -418,7 +418,7 @@ iscsi_parse_init_grp(struct spdk_conf_section *sp)
} }
} }
rc = spdk_iscsi_init_grp_create_from_initiator_list(tag, rc = iscsi_init_grp_create_from_initiator_list(tag,
num_initiator_names, initiators, num_initiator_masks, netmasks); num_initiator_names, initiators, num_initiator_masks, netmasks);
cleanup: cleanup:
@ -442,7 +442,7 @@ cleanup:
} }
int int
spdk_iscsi_init_grp_register(struct spdk_iscsi_init_grp *ig) iscsi_init_grp_register(struct spdk_iscsi_init_grp *ig)
{ {
struct spdk_iscsi_init_grp *tmp; struct spdk_iscsi_init_grp *tmp;
int rc = -1; int rc = -1;
@ -450,7 +450,7 @@ spdk_iscsi_init_grp_register(struct spdk_iscsi_init_grp *ig)
assert(ig != NULL); assert(ig != NULL);
pthread_mutex_lock(&g_iscsi.mutex); pthread_mutex_lock(&g_iscsi.mutex);
tmp = spdk_iscsi_init_grp_find_by_tag(ig->tag); tmp = iscsi_init_grp_find_by_tag(ig->tag);
if (tmp == NULL) { if (tmp == NULL) {
TAILQ_INSERT_TAIL(&g_iscsi.ig_head, ig, tailq); TAILQ_INSERT_TAIL(&g_iscsi.ig_head, ig, tailq);
rc = 0; rc = 0;
@ -466,7 +466,7 @@ spdk_iscsi_init_grp_register(struct spdk_iscsi_init_grp *ig)
* heap. Freed later by common initiator_group_destroy() code * heap. Freed later by common initiator_group_destroy() code
*/ */
int int
spdk_iscsi_init_grp_create_from_initiator_list(int tag, iscsi_init_grp_create_from_initiator_list(int tag,
int num_initiator_names, int num_initiator_names,
char **initiator_names, char **initiator_names,
int num_initiator_masks, int num_initiator_masks,
@ -499,7 +499,7 @@ spdk_iscsi_init_grp_create_from_initiator_list(int tag,
goto cleanup; goto cleanup;
} }
rc = spdk_iscsi_init_grp_register(ig); rc = iscsi_init_grp_register(ig);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("initiator group register error (%d)\n", tag); SPDK_ERRLOG("initiator group register error (%d)\n", tag);
goto cleanup; goto cleanup;
@ -507,12 +507,12 @@ spdk_iscsi_init_grp_create_from_initiator_list(int tag,
return 0; return 0;
cleanup: cleanup:
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
return rc; return rc;
} }
int int
spdk_iscsi_init_grp_add_initiators_from_initiator_list(int tag, iscsi_init_grp_add_initiators_from_initiator_list(int tag,
int num_initiator_names, int num_initiator_names,
char **initiator_names, char **initiator_names,
int num_initiator_masks, int num_initiator_masks,
@ -526,7 +526,7 @@ spdk_iscsi_init_grp_add_initiators_from_initiator_list(int tag,
tag, num_initiator_names, num_initiator_masks); tag, num_initiator_names, num_initiator_masks);
pthread_mutex_lock(&g_iscsi.mutex); pthread_mutex_lock(&g_iscsi.mutex);
ig = spdk_iscsi_init_grp_find_by_tag(tag); ig = iscsi_init_grp_find_by_tag(tag);
if (!ig) { if (!ig) {
pthread_mutex_unlock(&g_iscsi.mutex); pthread_mutex_unlock(&g_iscsi.mutex);
SPDK_ERRLOG("initiator group (%d) is not found\n", tag); SPDK_ERRLOG("initiator group (%d) is not found\n", tag);
@ -554,7 +554,7 @@ error:
} }
int int
spdk_iscsi_init_grp_delete_initiators_from_initiator_list(int tag, iscsi_init_grp_delete_initiators_from_initiator_list(int tag,
int num_initiator_names, int num_initiator_names,
char **initiator_names, char **initiator_names,
int num_initiator_masks, int num_initiator_masks,
@ -568,7 +568,7 @@ spdk_iscsi_init_grp_delete_initiators_from_initiator_list(int tag,
tag, num_initiator_names, num_initiator_masks); tag, num_initiator_names, num_initiator_masks);
pthread_mutex_lock(&g_iscsi.mutex); pthread_mutex_lock(&g_iscsi.mutex);
ig = spdk_iscsi_init_grp_find_by_tag(tag); ig = iscsi_init_grp_find_by_tag(tag);
if (!ig) { if (!ig) {
pthread_mutex_unlock(&g_iscsi.mutex); pthread_mutex_unlock(&g_iscsi.mutex);
SPDK_ERRLOG("initiator group (%d) is not found\n", tag); SPDK_ERRLOG("initiator group (%d) is not found\n", tag);
@ -597,7 +597,7 @@ error:
} }
void void
spdk_iscsi_init_grp_destroy(struct spdk_iscsi_init_grp *ig) iscsi_init_grp_destroy(struct spdk_iscsi_init_grp *ig)
{ {
if (!ig) { if (!ig) {
return; return;
@ -609,7 +609,7 @@ spdk_iscsi_init_grp_destroy(struct spdk_iscsi_init_grp *ig)
}; };
struct spdk_iscsi_init_grp * struct spdk_iscsi_init_grp *
spdk_iscsi_init_grp_find_by_tag(int tag) iscsi_init_grp_find_by_tag(int tag)
{ {
struct spdk_iscsi_init_grp *ig; struct spdk_iscsi_init_grp *ig;
@ -623,7 +623,7 @@ spdk_iscsi_init_grp_find_by_tag(int tag)
} }
int int
spdk_iscsi_parse_init_grps(void) iscsi_parse_init_grps(void)
{ {
struct spdk_conf_section *sp; struct spdk_conf_section *sp;
int rc; int rc;
@ -647,21 +647,21 @@ spdk_iscsi_parse_init_grps(void)
} }
void void
spdk_iscsi_init_grps_destroy(void) iscsi_init_grps_destroy(void)
{ {
struct spdk_iscsi_init_grp *ig, *tmp; struct spdk_iscsi_init_grp *ig, *tmp;
SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "spdk_iscsi_init_grp_array_destroy\n"); SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "iscsi_init_grp_array_destroy\n");
pthread_mutex_lock(&g_iscsi.mutex); pthread_mutex_lock(&g_iscsi.mutex);
TAILQ_FOREACH_SAFE(ig, &g_iscsi.ig_head, tailq, tmp) { TAILQ_FOREACH_SAFE(ig, &g_iscsi.ig_head, tailq, tmp) {
TAILQ_REMOVE(&g_iscsi.ig_head, ig, tailq); TAILQ_REMOVE(&g_iscsi.ig_head, ig, tailq);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
pthread_mutex_unlock(&g_iscsi.mutex); pthread_mutex_unlock(&g_iscsi.mutex);
} }
struct spdk_iscsi_init_grp * struct spdk_iscsi_init_grp *
spdk_iscsi_init_grp_unregister(int tag) iscsi_init_grp_unregister(int tag)
{ {
struct spdk_iscsi_init_grp *ig; struct spdk_iscsi_init_grp *ig;
@ -696,7 +696,7 @@ static const char *initiator_group_section = \
" Netmask " " Netmask "
void void
spdk_iscsi_init_grps_config_text(FILE *fp) iscsi_init_grps_config_text(FILE *fp)
{ {
struct spdk_iscsi_init_grp *ig; struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_name *iname; struct spdk_iscsi_initiator_name *iname;
@ -767,7 +767,7 @@ iscsi_init_grp_config_json(struct spdk_iscsi_init_grp *ig,
} }
void void
spdk_iscsi_init_grps_info_json(struct spdk_json_write_ctx *w) iscsi_init_grps_info_json(struct spdk_json_write_ctx *w)
{ {
struct spdk_iscsi_init_grp *ig; struct spdk_iscsi_init_grp *ig;
@ -777,7 +777,7 @@ spdk_iscsi_init_grps_info_json(struct spdk_json_write_ctx *w)
} }
void void
spdk_iscsi_init_grps_config_json(struct spdk_json_write_ctx *w) iscsi_init_grps_config_json(struct spdk_json_write_ctx *w)
{ {
struct spdk_iscsi_init_grp *ig; struct spdk_iscsi_init_grp *ig;

24
lib/iscsi/init_grp.h
View File

@ -60,22 +60,22 @@ struct spdk_iscsi_init_grp {
}; };
/* SPDK iSCSI Initiator Group management API */ /* SPDK iSCSI Initiator Group management API */
int spdk_iscsi_init_grp_create_from_initiator_list(int tag, int iscsi_init_grp_create_from_initiator_list(int tag,
int num_initiator_names, char **initiator_names, int num_initiator_names, char **initiator_names,
int num_initiator_masks, char **initiator_masks); int num_initiator_masks, char **initiator_masks);
int spdk_iscsi_init_grp_add_initiators_from_initiator_list(int tag, int iscsi_init_grp_add_initiators_from_initiator_list(int tag,
int num_initiator_names, char **initiator_names, int num_initiator_names, char **initiator_names,
int num_initiator_masks, char **initiator_masks); int num_initiator_masks, char **initiator_masks);
int spdk_iscsi_init_grp_delete_initiators_from_initiator_list(int tag, int iscsi_init_grp_delete_initiators_from_initiator_list(int tag,
int num_initiator_names, char **initiator_names, int num_initiator_names, char **initiator_names,
int num_initiator_masks, char **initiator_masks); int num_initiator_masks, char **initiator_masks);
int spdk_iscsi_init_grp_register(struct spdk_iscsi_init_grp *ig); int iscsi_init_grp_register(struct spdk_iscsi_init_grp *ig);
struct spdk_iscsi_init_grp *spdk_iscsi_init_grp_unregister(int tag); struct spdk_iscsi_init_grp *iscsi_init_grp_unregister(int tag);
struct spdk_iscsi_init_grp *spdk_iscsi_init_grp_find_by_tag(int tag); struct spdk_iscsi_init_grp *iscsi_init_grp_find_by_tag(int tag);
void spdk_iscsi_init_grp_destroy(struct spdk_iscsi_init_grp *ig); void iscsi_init_grp_destroy(struct spdk_iscsi_init_grp *ig);
int spdk_iscsi_parse_init_grps(void); int iscsi_parse_init_grps(void);
void spdk_iscsi_init_grps_destroy(void); void iscsi_init_grps_destroy(void);
void spdk_iscsi_init_grps_config_text(FILE *fp); void iscsi_init_grps_config_text(FILE *fp);
void spdk_iscsi_init_grps_info_json(struct spdk_json_write_ctx *w); void iscsi_init_grps_info_json(struct spdk_json_write_ctx *w);
void spdk_iscsi_init_grps_config_json(struct spdk_json_write_ctx *w); void iscsi_init_grps_config_json(struct spdk_json_write_ctx *w);
#endif /* SPDK_INIT_GRP_H */ #endif /* SPDK_INIT_GRP_H */

12
lib/iscsi/iscsi_rpc.c
View File

@ -58,7 +58,7 @@ spdk_rpc_iscsi_get_initiator_groups(struct spdk_jsonrpc_request *request,
w = spdk_jsonrpc_begin_result(request); w = spdk_jsonrpc_begin_result(request);
spdk_json_write_array_begin(w); spdk_json_write_array_begin(w);
spdk_iscsi_init_grps_info_json(w); iscsi_init_grps_info_json(w);
spdk_json_write_array_end(w); spdk_json_write_array_end(w);
spdk_jsonrpc_end_result(request, w); spdk_jsonrpc_end_result(request, w);
@ -152,7 +152,7 @@ spdk_rpc_iscsi_create_initiator_group(struct spdk_jsonrpc_request *request,
goto invalid; goto invalid;
} }
if (spdk_iscsi_init_grp_create_from_initiator_list(req.tag, if (iscsi_init_grp_create_from_initiator_list(req.tag,
req.initiator_list.num_initiators, req.initiator_list.num_initiators,
req.initiator_list.initiators, req.initiator_list.initiators,
req.netmask_list.num_netmasks, req.netmask_list.num_netmasks,
@ -195,7 +195,7 @@ spdk_rpc_iscsi_initiator_group_add_initiators(struct spdk_jsonrpc_request *reque
goto invalid; goto invalid;
} }
if (spdk_iscsi_init_grp_add_initiators_from_initiator_list(req.tag, if (iscsi_init_grp_add_initiators_from_initiator_list(req.tag,
req.initiator_list.num_initiators, req.initiator_list.num_initiators,
req.initiator_list.initiators, req.initiator_list.initiators,
req.netmask_list.num_netmasks, req.netmask_list.num_netmasks,
@ -233,7 +233,7 @@ spdk_rpc_iscsi_initiator_group_remove_initiators(struct spdk_jsonrpc_request *re
goto invalid; goto invalid;
} }
if (spdk_iscsi_init_grp_delete_initiators_from_initiator_list(req.tag, if (iscsi_init_grp_delete_initiators_from_initiator_list(req.tag,
req.initiator_list.num_initiators, req.initiator_list.num_initiators,
req.initiator_list.initiators, req.initiator_list.initiators,
req.netmask_list.num_netmasks, req.netmask_list.num_netmasks,
@ -281,12 +281,12 @@ spdk_rpc_iscsi_delete_initiator_group(struct spdk_jsonrpc_request *request,
goto invalid; goto invalid;
} }
ig = spdk_iscsi_init_grp_unregister(req.tag); ig = iscsi_init_grp_unregister(req.tag);
if (!ig) { if (!ig) {
goto invalid; goto invalid;
} }
iscsi_tgt_node_delete_map(NULL, ig); iscsi_tgt_node_delete_map(NULL, ig);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
w = spdk_jsonrpc_begin_result(request); w = spdk_jsonrpc_begin_result(request);
spdk_json_write_bool(w, true); spdk_json_write_bool(w, true);

8
lib/iscsi/iscsi_subsystem.c
View File

@ -1154,7 +1154,7 @@ iscsi_parse_configuration(void)
goto end; goto end;
} }
rc = spdk_iscsi_parse_init_grps(); rc = iscsi_parse_init_grps();
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("spdk_iscsi_parse_init_grps() failed\n"); SPDK_ERRLOG("spdk_iscsi_parse_init_grps() failed\n");
goto end; goto end;
@ -1408,7 +1408,7 @@ _iscsi_fini_dev_unreg(struct spdk_io_channel_iter *i, int status)
assert(TAILQ_EMPTY(&g_iscsi.poll_group_head)); assert(TAILQ_EMPTY(&g_iscsi.poll_group_head));
iscsi_shutdown_tgt_nodes(); iscsi_shutdown_tgt_nodes();
spdk_iscsi_init_grps_destroy(); iscsi_init_grps_destroy();
spdk_iscsi_portal_grps_destroy(); spdk_iscsi_portal_grps_destroy();
iscsi_auth_groups_destroy(); iscsi_auth_groups_destroy();
@ -1444,7 +1444,7 @@ spdk_iscsi_config_text(FILE *fp)
{ {
iscsi_globals_config_text(fp); iscsi_globals_config_text(fp);
spdk_iscsi_portal_grps_config_text(fp); spdk_iscsi_portal_grps_config_text(fp);
spdk_iscsi_init_grps_config_text(fp); iscsi_init_grps_config_text(fp);
iscsi_tgt_nodes_config_text(fp); iscsi_tgt_nodes_config_text(fp);
} }
@ -1568,7 +1568,7 @@ spdk_iscsi_config_json(struct spdk_json_write_ctx *w)
spdk_json_write_array_begin(w); spdk_json_write_array_begin(w);
iscsi_opts_config_json(w); iscsi_opts_config_json(w);
spdk_iscsi_portal_grps_config_json(w); spdk_iscsi_portal_grps_config_json(w);
spdk_iscsi_init_grps_config_json(w); iscsi_init_grps_config_json(w);
iscsi_tgt_nodes_config_json(w); iscsi_tgt_nodes_config_json(w);
iscsi_auth_groups_config_json(w); iscsi_auth_groups_config_json(w);
spdk_json_write_array_end(w); spdk_json_write_array_end(w);

4
lib/iscsi/tgt_node.c
View File

@ -714,7 +714,7 @@ iscsi_tgt_node_delete_pg_ig_map(struct spdk_iscsi_tgt_node *target,
SPDK_ERRLOG("%s: PortalGroup%d not found\n", target->name, pg_tag); SPDK_ERRLOG("%s: PortalGroup%d not found\n", target->name, pg_tag);
return -ENOENT; return -ENOENT;
} }
ig = spdk_iscsi_init_grp_find_by_tag(ig_tag); ig = iscsi_init_grp_find_by_tag(ig_tag);
if (ig == NULL) { if (ig == NULL) {
SPDK_ERRLOG("%s: InitiatorGroup%d not found\n", target->name, ig_tag); SPDK_ERRLOG("%s: InitiatorGroup%d not found\n", target->name, ig_tag);
return -ENOENT; return -ENOENT;
@ -754,7 +754,7 @@ iscsi_tgt_node_add_pg_ig_map(struct spdk_iscsi_tgt_node *target,
SPDK_ERRLOG("%s: PortalGroup%d not found\n", target->name, pg_tag); SPDK_ERRLOG("%s: PortalGroup%d not found\n", target->name, pg_tag);
return -ENOENT; return -ENOENT;
} }
ig = spdk_iscsi_init_grp_find_by_tag(ig_tag); ig = iscsi_init_grp_find_by_tag(ig_tag);
if (ig == NULL) { if (ig == NULL) {
SPDK_ERRLOG("%s: InitiatorGroup%d not found\n", target->name, ig_tag); SPDK_ERRLOG("%s: InitiatorGroup%d not found\n", target->name, ig_tag);
return -ENOENT; return -ENOENT;

56
test/unit/lib/iscsi/init_grp.c/init_grp_ut.c
View File

@ -77,7 +77,7 @@ create_from_config_file_cases(void)
rc = iscsi_parse_init_grp(sp); rc = iscsi_parse_init_grp(sp);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
spdk_iscsi_init_grps_destroy(); iscsi_init_grps_destroy();
section_index++; section_index++;
} }
@ -94,7 +94,7 @@ create_from_config_file_cases(void)
rc = iscsi_parse_init_grp(sp); rc = iscsi_parse_init_grp(sp);
CU_ASSERT(rc != 0); CU_ASSERT(rc != 0);
spdk_iscsi_init_grps_destroy(); iscsi_init_grps_destroy();
section_index++; section_index++;
} }
@ -111,7 +111,7 @@ create_initiator_group_success_case(void)
ig = iscsi_init_grp_create(1); ig = iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL); CU_ASSERT(ig != NULL);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -123,17 +123,17 @@ find_initiator_group_success_case(void)
ig = iscsi_init_grp_create(1); ig = iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL); CU_ASSERT(ig != NULL);
rc = spdk_iscsi_init_grp_register(ig); rc = iscsi_init_grp_register(ig);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
ig = spdk_iscsi_init_grp_find_by_tag(1); ig = iscsi_init_grp_find_by_tag(1);
CU_ASSERT(ig != NULL); CU_ASSERT(ig != NULL);
tmp = spdk_iscsi_init_grp_unregister(1); tmp = iscsi_init_grp_unregister(1);
CU_ASSERT(ig == tmp); CU_ASSERT(ig == tmp);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
ig = spdk_iscsi_init_grp_find_by_tag(1); ig = iscsi_init_grp_find_by_tag(1);
CU_ASSERT(ig == NULL); CU_ASSERT(ig == NULL);
} }
@ -146,20 +146,20 @@ register_initiator_group_twice_case(void)
ig = iscsi_init_grp_create(1); ig = iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL); CU_ASSERT(ig != NULL);
rc = spdk_iscsi_init_grp_register(ig); rc = iscsi_init_grp_register(ig);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
rc = spdk_iscsi_init_grp_register(ig); rc = iscsi_init_grp_register(ig);
CU_ASSERT(rc != 0); CU_ASSERT(rc != 0);
ig = spdk_iscsi_init_grp_find_by_tag(1); ig = iscsi_init_grp_find_by_tag(1);
CU_ASSERT(ig != NULL); CU_ASSERT(ig != NULL);
tmp = spdk_iscsi_init_grp_unregister(1); tmp = iscsi_init_grp_unregister(1);
CU_ASSERT(tmp == ig); CU_ASSERT(tmp == ig);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
ig = spdk_iscsi_init_grp_find_by_tag(1); ig = iscsi_init_grp_find_by_tag(1);
CU_ASSERT(ig == NULL); CU_ASSERT(ig == NULL);
} }
@ -203,7 +203,7 @@ add_initiator_name_success_case(void)
iname = iscsi_init_grp_find_initiator(ig, name2); iname = iscsi_init_grp_find_initiator(ig, name2);
CU_ASSERT(iname == NULL); CU_ASSERT(iname == NULL);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -239,7 +239,7 @@ add_initiator_name_fail_case(void)
iname = iscsi_init_grp_find_initiator(ig, name1); iname = iscsi_init_grp_find_initiator(ig, name1);
CU_ASSERT(iname == NULL); CU_ASSERT(iname == NULL);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -272,7 +272,7 @@ delete_all_initiator_names_success_case(void)
CU_ASSERT(iname == NULL); CU_ASSERT(iname == NULL);
/* restore the initial state */ /* restore the initial state */
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -314,7 +314,7 @@ add_netmask_success_case(void)
imask = iscsi_init_grp_find_netmask(ig, netmask2); imask = iscsi_init_grp_find_netmask(ig, netmask2);
CU_ASSERT(imask == NULL); CU_ASSERT(imask == NULL);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -350,7 +350,7 @@ add_netmask_fail_case(void)
imask = iscsi_init_grp_find_netmask(ig, netmask1); imask = iscsi_init_grp_find_netmask(ig, netmask1);
CU_ASSERT(imask == NULL); CU_ASSERT(imask == NULL);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -383,7 +383,7 @@ delete_all_netmasks_success_case(void)
CU_ASSERT(imask == NULL); CU_ASSERT(imask == NULL);
/* restore the initial state */ /* restore the initial state */
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -424,7 +424,7 @@ initiator_name_overwrite_all_to_any_case(void)
rc = iscsi_init_grp_delete_initiator(ig, any_not); rc = iscsi_init_grp_delete_initiator(ig, any_not);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -451,7 +451,7 @@ netmask_overwrite_all_to_any_case(void)
rc = iscsi_init_grp_delete_netmask(ig, any); rc = iscsi_init_grp_delete_netmask(ig, any);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -480,7 +480,7 @@ add_delete_initiator_names_case(void)
CU_ASSERT(TAILQ_EMPTY(&ig->initiator_head)); CU_ASSERT(TAILQ_EMPTY(&ig->initiator_head));
} }
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -500,7 +500,7 @@ add_duplicated_initiator_names_case(void)
CU_ASSERT(TAILQ_EMPTY(&ig->initiator_head)); CU_ASSERT(TAILQ_EMPTY(&ig->initiator_head));
} }
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -538,7 +538,7 @@ delete_nonexisting_initiator_names_case(void)
CU_ASSERT(TAILQ_EMPTY(&ig->initiator_head)); CU_ASSERT(TAILQ_EMPTY(&ig->initiator_head));
} }
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -567,7 +567,7 @@ add_delete_netmasks_case(void)
CU_ASSERT(TAILQ_EMPTY(&ig->netmask_head)); CU_ASSERT(TAILQ_EMPTY(&ig->netmask_head));
} }
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -587,7 +587,7 @@ add_duplicated_netmasks_case(void)
CU_ASSERT(TAILQ_EMPTY(&ig->netmask_head)); CU_ASSERT(TAILQ_EMPTY(&ig->netmask_head));
} }
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }
static void static void
@ -625,7 +625,7 @@ delete_nonexisting_netmasks_case(void)
CU_ASSERT(TAILQ_EMPTY(&ig->netmask_head)); CU_ASSERT(TAILQ_EMPTY(&ig->netmask_head));
} }
spdk_iscsi_init_grp_destroy(ig); iscsi_init_grp_destroy(ig);
} }

2
test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c
View File

@ -74,7 +74,7 @@ DEFINE_STUB(spdk_sock_is_ipv4, bool, (struct spdk_sock *sock), false);
DEFINE_STUB(spdk_iscsi_portal_grp_find_by_tag, DEFINE_STUB(spdk_iscsi_portal_grp_find_by_tag,
struct spdk_iscsi_portal_grp *, (int tag), NULL); struct spdk_iscsi_portal_grp *, (int tag), NULL);
DEFINE_STUB(spdk_iscsi_init_grp_find_by_tag, struct spdk_iscsi_init_grp *, DEFINE_STUB(iscsi_init_grp_find_by_tag, struct spdk_iscsi_init_grp *,
(int tag), NULL); (int tag), NULL);
struct spdk_scsi_lun * struct spdk_scsi_lun *