Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 May 2016 10:59:36 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r300368 - head/sys/dev/iscsi
Message-ID:  <201605211059.u4LAxaEN004127@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trasz
Date: Sat May 21 10:59:36 2016
New Revision: 300368
URL: https://svnweb.freebsd.org/changeset/base/300368

Log:
  Pass maxtags value to the ICL module.  iSER needs it.
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/iscsi/icl.h
  head/sys/dev/iscsi/iscsi.c

Modified: head/sys/dev/iscsi/icl.h
==============================================================================
--- head/sys/dev/iscsi/icl.h	Sat May 21 10:53:45 2016	(r300367)
+++ head/sys/dev/iscsi/icl.h	Sat May 21 10:59:36 2016	(r300368)
@@ -110,6 +110,7 @@ struct icl_conn {
 	bool			ic_send_running;
 	bool			ic_receive_running;
 	size_t			ic_max_data_segment_length;
+	size_t			ic_maxtags;
 	bool			ic_disconnecting;
 	bool			ic_iser;
 	const char		*ic_name;

Modified: head/sys/dev/iscsi/iscsi.c
==============================================================================
--- head/sys/dev/iscsi/iscsi.c	Sat May 21 10:53:45 2016	(r300367)
+++ head/sys/dev/iscsi/iscsi.c	Sat May 21 10:59:36 2016	(r300368)
@@ -1403,6 +1403,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_
 		ic->ic_data_crc32c = true;
 	else
 		ic->ic_data_crc32c = false;
+	ic->ic_maxtags = maxtags;
 
 	is->is_cmdsn = 0;
 	is->is_expcmdsn = 0;
@@ -1442,7 +1443,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_
 
 	} else {
 		ISCSI_SESSION_LOCK(is);
-		is->is_devq = cam_simq_alloc(maxtags);
+		is->is_devq = cam_simq_alloc(ic->ic_maxtags);
 		if (is->is_devq == NULL) {
 			ISCSI_SESSION_WARN(is, "failed to allocate simq");
 			iscsi_session_terminate(is);
@@ -1451,7 +1452,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_
 
 		is->is_sim = cam_sim_alloc(iscsi_action, iscsi_poll, "iscsi",
 		    is, is->is_id /* unit */, &is->is_lock,
-		    1, maxtags, is->is_devq);
+		    1, ic->ic_maxtags, is->is_devq);
 		if (is->is_sim == NULL) {
 			ISCSI_SESSION_UNLOCK(is);
 			ISCSI_SESSION_WARN(is, "failed to allocate SIM");



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605211059.u4LAxaEN004127>