Commit cce7b307 authored by Jim Harris's avatar Jim Harris
Browse files

iscsi: remove global MaxOutstandingR2T parameter 



This was not used anywhere - sessions default to
DEFAULT_MAXOUTSTANDINGR2T and never look at the global
MaxOutstandingR2T value.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ia4874d8d747063f729061124194b60d15ad3ddac

Reviewed-on: https://review.gerrithub.io/385488


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatar <shuhei.matsumoto.xt@hitachi.com>
parent c40524fb

lib/iscsi/iscsi.h

+0 −1
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ struct spdk_iscsi_globals { 
	uint32_t MaxSessions;

	uint32_t MaxConnectionsPerSession;

	uint32_t MaxConnections;

	uint32_t MaxOutstandingR2T;

	uint32_t DefaultTime2Wait;

	uint32_t DefaultTime2Retain;

	uint32_t FirstBurstLength;

lib/iscsi/iscsi_subsystem.c

+1 −7
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ 
"  MaxSessions %d\n" \

"  MaxConnectionsPerSession %d\n" \

"  MaxConnections %d\n" \

"  MaxOutstandingR2T %d\n" \

"\n" \

"  # iSCSI initial parameters negotiate with initiators\n" \

"  # NOTE: incorrect values might crash\n" \
@@ -107,7 +106,7 @@ spdk_iscsi_config_dump_section(FILE *fp) 
		g_spdk_iscsi.nodebase, g_spdk_iscsi.authfile,

		g_spdk_iscsi.timeout, authmethod, authgroup,

		g_spdk_iscsi.MaxSessions, g_spdk_iscsi.MaxConnectionsPerSession,

		g_spdk_iscsi.MaxConnections, g_spdk_iscsi.MaxOutstandingR2T,

		g_spdk_iscsi.MaxConnections,

		g_spdk_iscsi.DefaultTime2Wait, g_spdk_iscsi.DefaultTime2Retain,

		(g_spdk_iscsi.ImmediateData == 1) ? "Yes" : "No",

		(g_spdk_iscsi.DataPDUInOrder == 1) ? "Yes" : "No",
@@ -646,11 +645,6 @@ spdk_iscsi_app_read_parameters(void) 
	SPDK_DEBUGLOG(SPDK_TRACE_ISCSI, "DefaultTime2Retain %d\n",

		      g_spdk_iscsi.DefaultTime2Retain);



	/* check size limit - RFC3720(12.15, 12.16, 12.17) */

	if (g_spdk_iscsi.MaxOutstandingR2T > 65535) {

		SPDK_ERRLOG("MaxOutstandingR2T(%d) > 65535\n", g_spdk_iscsi.MaxOutstandingR2T);

		return -1;

	}

	if (g_spdk_iscsi.DefaultTime2Wait > 3600) {

		SPDK_ERRLOG("DefaultTime2Wait(%d) > 3600\n", g_spdk_iscsi.DefaultTime2Wait);

		return -1;

test/iscsi_tgt/calsoft/iscsi.conf

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
  DiscoveryAuthGroup AuthGroup1

  MaxSessions 256

  MaxR2T 256

  MaxOutstandingR2T 256

  FirstBurstLength 262144

  MaxBurstLength 16776192

  MaxRecvDataSegmentLength 131072