[src/netbsd-7]: src/sys/dev/iscsi Pull up following revision(s) (requested by...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/abbaecdf707b
branches:  netbsd-7
changeset: 798380:abbaecdf707b
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Sep 29 15:45:36 2014 +0000

description:
Pull up following revision(s) (requested by tls in ticket #119):
        sys/dev/iscsi/iscsi_send.c: revision 1.10
The "throttling" code in the in-kernel iSCSI initiator is very questionable;
it sleeps on a ccb that appears highly unlikely to wake up, since it seems
to be waiting to _submit_ that very ccb!  This is doubtless why someone tried
to disable it in the default case via several #defines.
Unfortunately one of those #defines is later tested backwards.  Fix that.
The in-kernel initiator now seems to survive a system build without hanging.

diffstat:

 sys/dev/iscsi/iscsi_send.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 1e2be84a05fe -r abbaecdf707b sys/dev/iscsi/iscsi_send.c
--- a/sys/dev/iscsi/iscsi_send.c        Mon Sep 29 15:31:01 2014 +0000
+++ b/sys/dev/iscsi/iscsi_send.c        Mon Sep 29 15:45:36 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iscsi_send.c,v 1.8 2012/12/29 11:05:30 mlelstv Exp $   */
+/*     $NetBSD: iscsi_send.c,v 1.8.12.1 2014/09/29 15:45:36 msaitoh Exp $      */
 
 /*-
  * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -1378,7 +1378,7 @@
 
        s = splbio();
        while (/*CONSTCOND*/ISCSI_THROTTLING_ENABLED &&
-           /*CONSTCOND*/ISCSI_SERVER_TRUSTED &&
+           /*CONSTCOND*/!ISCSI_SERVER_TRUSTED &&
            !sn_a_le_b(sess->CmdSN, sess->MaxCmdSN)) {
 
                ccb->disp = disp;