Commit a07416d8 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

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: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/381244


Reviewed-by: default avatarJohn Kariuki <John.K.Kariuki@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 3f9d0fb3

lib/iscsi/tgt_node.c

+1 −14
Original line number Diff line number Diff line
@@ -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);

lib/iscsi/tgt_node.h

+0 −3
Original line number Diff line number Diff line
@@ -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.

 */

test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c

+6 −0
Original line number Diff line number Diff line
@@ -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)

{