From owner-svn-src-all@freebsd.org Sat May 21 10:59:37 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7F4AB44BEF; Sat, 21 May 2016 10:59:37 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 896791951; Sat, 21 May 2016 10:59:37 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4LAxag0004129; Sat, 21 May 2016 10:59:36 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4LAxaEN004127; Sat, 21 May 2016 10:59:36 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201605211059.u4LAxaEN004127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sat, 21 May 2016 10:59:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300368 - head/sys/dev/iscsi X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 May 2016 10:59:37 -0000 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");