From a07416d8d0a61b61583d36cd4f713ee3a821f49d Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 10 Oct 2017 10:08:42 +0900 Subject: [PATCH] iscsi: delete spdk_iscsi_find_init_grp() function. the function of spdk_iscsi_find_init_grp() is duplicated with of spdk_iscsi_init_grp_find_by_tag(). The later one should be kept. Hence delete former one. Change-Id: I8d397648bd400550445de49c8a7731f0932f5324 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/381244 Reviewed-by: John Kariuki Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris --- lib/iscsi/tgt_node.c | 15 +-------------- lib/iscsi/tgt_node.h | 3 --- test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c | 6 ++++++ 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index 1fea70cfe..30a093887 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -466,19 +466,6 @@ spdk_iscsi_find_tgt_node(const char *target_name) return NULL; } -struct spdk_iscsi_init_grp * -spdk_iscsi_find_init_grp(int tag) -{ - struct spdk_iscsi_init_grp *ig; - - TAILQ_FOREACH(ig, &g_spdk_iscsi.ig_head, tailq) { - if (ig->tag == tag) { - return ig; - } - } - return NULL; -} - static int spdk_check_iscsi_name(const char *name) { @@ -578,7 +565,7 @@ spdk_iscsi_tgt_node_add_map(struct spdk_iscsi_tgt_node *target, SPDK_ERRLOG("%s: PortalGroup%d not active\n", target->name, pg_tag); return NULL; } - ig = spdk_iscsi_find_init_grp(ig_tag); + ig = spdk_iscsi_init_grp_find_by_tag(ig_tag); if (ig == NULL) { pthread_mutex_unlock(&g_spdk_iscsi.mutex); SPDK_ERRLOG("%s: InitiatorGroup%d not found\n", target->name, ig_tag); diff --git a/lib/iscsi/tgt_node.h b/lib/iscsi/tgt_node.h index cda476e61..ed87f83d2 100644 --- a/lib/iscsi/tgt_node.h +++ b/lib/iscsi/tgt_node.h @@ -85,9 +85,6 @@ int spdk_iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len, int data_len); -struct spdk_iscsi_init_grp * -spdk_iscsi_find_init_grp(int tag); - /* This typedef exists to work around an astyle 2.05 bug. * Remove it when astyle is fixed. */ diff --git a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c index 6ee94e85e..adb4c1356 100644 --- a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c +++ b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c @@ -63,6 +63,12 @@ spdk_iscsi_portal_grp_find_by_tag(int tag) return NULL; } +struct spdk_iscsi_init_grp * +spdk_iscsi_init_grp_find_by_tag(int tag) +{ + return NULL; +} + struct spdk_scsi_lun * spdk_scsi_dev_get_lun(struct spdk_scsi_dev *dev, int lun_id) {