From owner-svn-src-all@FreeBSD.ORG  Thu Feb  3 02:14:54 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D2A51065670;
	Thu,  3 Feb 2011 02:14:54 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F18F98FC13;
	Thu,  3 Feb 2011 02:14:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p132Erm0029935;
	Thu, 3 Feb 2011 02:14:53 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p132Er6s029933;
	Thu, 3 Feb 2011 02:14:53 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201102030214.p132Er6s029933@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 3 Feb 2011 02:14:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218207 - head/sys/dev/aac
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Feb 2011 02:14:54 -0000

Author: emaste
Date: Thu Feb  3 02:14:53 2011
New Revision: 218207
URL: http://svn.freebsd.org/changeset/base/218207

Log:
  Revert part of r173264.  Both aac_ioctl_sendfib and aac_ioctl_send_raw_srb
  make use of the aac_ioctl_event callback, if aac_alloc_command fails.  This
  can end up in an infinite loop in the while loop in aac_release_command.
  
  Further investigation into the issue mentioned by Scott Long [1] will be
  necessary.
  
  [1] http://lists.freebsd.org/pipermail/freebsd-current/2007-October/078740.html

Modified:
  head/sys/dev/aac/aac.c

Modified: head/sys/dev/aac/aac.c
==============================================================================
--- head/sys/dev/aac/aac.c	Wed Feb  2 23:59:24 2011	(r218206)
+++ head/sys/dev/aac/aac.c	Thu Feb  3 02:14:53 2011	(r218207)
@@ -1415,11 +1415,7 @@ aac_release_command(struct aac_command *
 
 	aac_enqueue_free(cm);
 
-	/*
-	 * Dequeue all events so that there's no risk of events getting
-	 * stranded.
-	 */
-	while ((event = TAILQ_FIRST(&sc->aac_ev_cmfree)) != NULL) {
+	if ((event = TAILQ_FIRST(&sc->aac_ev_cmfree)) != NULL) {
 		TAILQ_REMOVE(&sc->aac_ev_cmfree, event, ev_links);
 		event->ev_callback(sc, event, event->ev_arg);
 	}