From owner-svn-src-head@freebsd.org Thu May 19 14:57:38 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 76878B42C9A;
Thu, 19 May 2016 14:57:38 +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 47D6813D0;
Thu, 19 May 2016 14:57:38 +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 u4JEvb4N095086;
Thu, 19 May 2016 14:57:37 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4JEvbXV095085;
Thu, 19 May 2016 14:57:37 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201605191457.u4JEvbXV095085@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 19 May 2016 14:57:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r300211 - 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-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 May 2016 14:57:38 -0000
Author: trasz
Date: Thu May 19 14:57:37 2016
New Revision: 300211
URL: https://svnweb.freebsd.org/changeset/base/300211
Log:
Make ICL proxy use kernel code for handling iSCSI sequence numbers
for PDUs to/from iscsid(8). This fixes StatSN for Logout PDUs sent
by iscsi_session_logout().
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/iscsi/iscsi.c
Modified: head/sys/dev/iscsi/iscsi.c
==============================================================================
--- head/sys/dev/iscsi/iscsi.c Thu May 19 14:45:34 2016 (r300210)
+++ head/sys/dev/iscsi/iscsi.c Thu May 19 14:57:37 2016 (r300211)
@@ -713,6 +713,8 @@ iscsi_receive_callback(struct icl_pdu *r
ISCSI_SESSION_LOCK(is);
+ iscsi_pdu_update_statsn(response);
+
#ifdef ICL_KERNEL_PROXY
if (is->is_login_phase) {
if (is->is_login_pdu == NULL)
@@ -725,8 +727,6 @@ iscsi_receive_callback(struct icl_pdu *r
}
#endif
- iscsi_pdu_update_statsn(response);
-
/*
* The handling routine is responsible for freeing the PDU
* when it's no longer needed.
@@ -1620,9 +1620,7 @@ iscsi_ioctl_daemon_send(struct iscsi_sof
KASSERT(error == 0, ("icl_pdu_append_data(..., M_WAITOK) failed"));
free(data, M_ISCSI);
}
- ISCSI_SESSION_LOCK(is);
- icl_pdu_queue(ip);
- ISCSI_SESSION_UNLOCK(is);
+ iscsi_pdu_queue(ip);
return (0);
}