Commit 86922ce0 authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

lib/iscsi: Remove spdk_iscsi_conn_fn in conn 



Also remove the related login and full feature
function

Change-Id: Ia2d0a6617910134c889d1322b53830fe26b9e956
Signed-off-by: default avatarZiye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/402486


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent da9f2168

lib/iscsi/conn.c

+3 −15
Original line number Diff line number Diff line
@@ -197,12 +197,10 @@ spdk_iscsi_poll_group_remove_conn_sock(struct spdk_iscsi_conn *conn) 
}



static void

spdk_iscsi_poll_group_add_conn(struct spdk_iscsi_conn *conn,

			       spdk_iscsi_conn_fn fn)

spdk_iscsi_poll_group_add_conn(struct spdk_iscsi_conn *conn)

{

	struct spdk_iscsi_poll_group *poll_group = &g_spdk_iscsi.poll_group[spdk_env_get_current_core()];



	conn->fn = fn;

	STAILQ_INSERT_TAIL(&poll_group->connections, conn, link);

	spdk_iscsi_poll_group_add_conn_sock(conn);

}
@@ -331,7 +329,7 @@ error_return: 
	conn->lcore = spdk_env_get_current_core();

	__sync_fetch_and_add(&g_num_connections[conn->lcore], 1);



	spdk_iscsi_poll_group_add_conn(conn, spdk_iscsi_conn_login_do_work);

	spdk_iscsi_poll_group_add_conn(conn);

	return 0;

}
@@ -1178,7 +1176,7 @@ spdk_iscsi_conn_full_feature_migrate(void *arg1, void *arg2) 


	/* The poller has been unregistered, so now we can re-register it on the new core. */

	conn->lcore = spdk_env_get_current_core();

	spdk_iscsi_poll_group_add_conn(conn, spdk_iscsi_conn_full_feature_do_work);

	spdk_iscsi_poll_group_add_conn(conn);

}



void
@@ -1221,16 +1219,6 @@ spdk_iscsi_conn_migration(struct spdk_iscsi_conn *conn) 
	spdk_event_call(event);

}



void

spdk_iscsi_conn_login_do_work(void *arg)

{

}



void

spdk_iscsi_conn_full_feature_do_work(void *arg)

{

}



void

spdk_iscsi_conn_set_min_per_core(int count)

{

lib/iscsi/conn.h

+0 −2
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
#define TRACE_ISCSI_CONN_IDLE		SPDK_TPOINT_ID(TRACE_GROUP_ISCSI, 0x7)



struct spdk_poller;

typedef void (*spdk_iscsi_conn_fn)(void *arg);



struct spdk_iscsi_conn {

	int				id;
@@ -160,7 +159,6 @@ struct spdk_iscsi_conn { 
	char *partial_text_parameter;



	STAILQ_ENTRY(spdk_iscsi_conn) link;

	spdk_iscsi_conn_fn	fn;

	struct spdk_poller	*flush_poller;

	TAILQ_HEAD(queued_r2t_tasks, spdk_iscsi_task)	queued_r2t_tasks;

	TAILQ_HEAD(active_r2t_tasks, spdk_iscsi_task)	active_r2t_tasks;