From 1f94a99933b607abfaa35cdb1ea3f28dd7d90bfb Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Mon, 26 Feb 2018 11:38:39 +0800 Subject: [PATCH] lib/iscsi: Change the function name of spdk_iscsi_conn_stop_poller The iSCSI connection does not have the poller anymore, so change the name Change-Id: I534f72998c6bcc73ad9caf5e8f700751acd95c99 Signed-off-by: Ziye Yang Reviewed-on: https://review.gerrithub.io/401372 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Daniel Verkamp --- lib/iscsi/conn.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c index 8056611d0..2628526fb 100644 --- a/lib/iscsi/conn.c +++ b/lib/iscsi/conn.c @@ -80,7 +80,7 @@ void spdk_iscsi_conn_login_do_work(void *arg); void spdk_iscsi_conn_full_feature_do_work(void *arg); static void spdk_iscsi_conn_full_feature_migrate(void *arg1, void *arg2); -static void spdk_iscsi_conn_stop_poller(struct spdk_iscsi_conn *conn); +static void spdk_iscsi_conn_stop(struct spdk_iscsi_conn *conn); static struct spdk_iscsi_conn * allocate_conn(void) @@ -481,7 +481,7 @@ _spdk_iscsi_conn_check_shutdown(void *arg) spdk_poller_unregister(&conn->shutdown_timer); - spdk_iscsi_conn_stop_poller(conn); + spdk_iscsi_conn_stop(conn); _spdk_iscsi_conn_free(conn); } @@ -509,7 +509,7 @@ void spdk_iscsi_conn_destruct(struct spdk_iscsi_conn *conn) /* The connection cannot be freed yet. Check back later. */ conn->shutdown_timer = spdk_poller_register(_spdk_iscsi_conn_check_shutdown, conn, 1000); } else { - spdk_iscsi_conn_stop_poller(conn); + spdk_iscsi_conn_stop(conn); _spdk_iscsi_conn_free(conn); } } @@ -563,10 +563,10 @@ spdk_iscsi_conn_check_shutdown(void *arg) } /** - * This function will stop the poller for the specified connection. + * This function will stop executing the specified connection. */ static void -spdk_iscsi_conn_stop_poller(struct spdk_iscsi_conn *conn) +spdk_iscsi_conn_stop(struct spdk_iscsi_conn *conn) { struct spdk_iscsi_tgt_node *target; @@ -1210,7 +1210,7 @@ spdk_iscsi_conn_login_do_work(void *arg) pthread_mutex_unlock(&target->mutex); } - spdk_iscsi_conn_stop_poller(conn); + spdk_iscsi_conn_stop(conn); __sync_fetch_and_add(&g_num_connections[lcore], 1); event = spdk_event_allocate(lcore, spdk_iscsi_conn_full_feature_migrate,