Module Name: src Committed By: msaitoh Date: Mon Sep 29 15:45:36 UTC 2014
Modified Files: src/sys/dev/iscsi [netbsd-7]: iscsi_send.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.12.1 src/sys/dev/iscsi/iscsi_send.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/iscsi/iscsi_send.c diff -u src/sys/dev/iscsi/iscsi_send.c:1.8 src/sys/dev/iscsi/iscsi_send.c:1.8.12.1 --- src/sys/dev/iscsi/iscsi_send.c:1.8 Sat Dec 29 11:05:30 2012 +++ src/sys/dev/iscsi/iscsi_send.c Mon Sep 29 15:45:36 2014 @@ -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 @@ send_command(ccb_t *ccb, ccb_disp_t disp 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;