svn commit: r214871 - stable/7/sys/kern

[Lawrence Stewart]

Author: lstewart
Date: Sat Nov  6 11:23:46 2010
New Revision: 214871
URL: http://svn.freebsd.org/changeset/base/214871

Log:
  MFC r206028:
  
  The ALQ should not be considered drained until it has been made inactive.
  
  Sponsored by:	FreeBSD Foundation
  Reviewed by:	dwmalone, jeff, rpaulo, rwatson (as part of a larger patch)

Modified:
  stable/7/sys/kern/kern_alq.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/kern/kern_alq.c
==============================================================================
--- stable/7/sys/kern/kern_alq.c	Sat Nov  6 11:20:20 2010	(r214870)
+++ stable/7/sys/kern/kern_alq.c	Sat Nov  6 11:23:46 2010	(r214871)
@@ -253,7 +253,7 @@ alq_shutdown(struct alq *alq)
 	alq->aq_flags |= AQ_SHUTDOWN;
 
 	/* Drain IO */
-	while (alq->aq_flags & (AQ_FLUSHING|AQ_ACTIVE)) {
+	while (alq->aq_flags & AQ_ACTIVE) {
 		alq->aq_flags |= AQ_WANTED;
 		ALQ_UNLOCK(alq);
 		tsleep(alq, PWAIT, "aldclose", 0);