Commit e685db2c authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

lib/iscsi: Rename link pointer to pg->connections from link to pg_link 



Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I50902ebf0ac1ee103d2bf999578e68637efcc123
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3088


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent fc250841

lib/iscsi/conn.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ iscsi_poll_group_add_conn(struct spdk_iscsi_poll_group *pg, struct spdk_iscsi_co 
	}



	conn->is_stopped = false;

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

	STAILQ_INSERT_TAIL(&pg->connections, conn, pg_link);

}



static void
@@ -195,7 +195,7 @@ iscsi_poll_group_remove_conn(struct spdk_iscsi_poll_group *pg, struct spdk_iscsi 
	}



	conn->is_stopped = true;

	STAILQ_REMOVE(&pg->connections, conn, spdk_iscsi_conn, link);

	STAILQ_REMOVE(&pg->connections, conn, spdk_iscsi_conn, pg_link);

}



static void

lib/iscsi/conn.h

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ struct spdk_iscsi_conn { 
	uint32_t ttt; /* target transfer tag */

	char *partial_text_parameter;



	STAILQ_ENTRY(spdk_iscsi_conn) link;

	STAILQ_ENTRY(spdk_iscsi_conn) pg_link;

	bool			is_stopped;  /* Set true when connection is stopped for migration */

	TAILQ_HEAD(queued_r2t_tasks, spdk_iscsi_task)	queued_r2t_tasks;

	TAILQ_HEAD(active_r2t_tasks, spdk_iscsi_task)	active_r2t_tasks;

lib/iscsi/iscsi_rpc.c

+1 −1
Original line number Diff line number Diff line
@@ -977,7 +977,7 @@ _rpc_iscsi_get_connections(struct spdk_io_channel_iter *i) 
	struct spdk_iscsi_poll_group *pg = spdk_io_channel_get_ctx(ch);

	struct spdk_iscsi_conn *conn;



	STAILQ_FOREACH(conn, &pg->connections, link) {

	STAILQ_FOREACH(conn, &pg->connections, pg_link) {

		iscsi_conn_info_json(ctx->w, conn);

	}

lib/iscsi/iscsi_subsystem.c

+2 −2
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ iscsi_poll_group_poll(void *ctx) 
		SPDK_ERRLOG("Failed to poll sock_group=%p\n", group->sock_group);

	}



	STAILQ_FOREACH_SAFE(conn, &group->connections, link, tmp) {

	STAILQ_FOREACH_SAFE(conn, &group->connections, pg_link, tmp) {

		if (conn->state == ISCSI_CONN_STATE_EXITING) {

			iscsi_conn_destruct(conn);

		}
@@ -1212,7 +1212,7 @@ iscsi_poll_group_handle_nop(void *ctx) 
	struct spdk_iscsi_poll_group *group = ctx;

	struct spdk_iscsi_conn *conn, *tmp;



	STAILQ_FOREACH_SAFE(conn, &group->connections, link, tmp) {

	STAILQ_FOREACH_SAFE(conn, &group->connections, pg_link, tmp) {

		iscsi_conn_handle_nop(conn);

	}