From owner-svn-src-user@FreeBSD.ORG  Wed Mar 10 07:25:17 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0EF551065679;
	Wed, 10 Mar 2010 07:25:17 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F1E7F8FC13;
	Wed, 10 Mar 2010 07:25:16 +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 o2A7PGgQ067289;
	Wed, 10 Mar 2010 07:25:16 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2A7PGv9067287;
	Wed, 10 Mar 2010 07:25:16 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <201003100725.o2A7PGv9067287@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Wed, 10 Mar 2010 07:25:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204945 - user/lstewart/alq_varlen_head/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Mar 2010 07:25:17 -0000

Author: lstewart
Date: Wed Mar 10 07:25:16 2010
New Revision: 204945
URL: http://svn.freebsd.org/changeset/base/204945

Log:
  This change should have been in r204749 instead of what was actually committed.
  Module unloading now works again.
  
  Sponsored by:	FreeBSD Foundation

Modified:
  user/lstewart/alq_varlen_head/sys/kern/kern_alq.c

Modified: user/lstewart/alq_varlen_head/sys/kern/kern_alq.c
==============================================================================
--- user/lstewart/alq_varlen_head/sys/kern/kern_alq.c	Wed Mar 10 07:07:12 2010	(r204944)
+++ user/lstewart/alq_varlen_head/sys/kern/kern_alq.c	Wed Mar 10 07:25:16 2010	(r204945)
@@ -787,7 +787,6 @@ alq_load_handler(module_t mod, int what,
 	case MOD_SHUTDOWN:
 		break;
 
-	case MOD_UNLOAD:
 	case MOD_QUIESCE:
 		ALD_LOCK();
 		/* Only allow unload if there are no open queues. */
@@ -802,6 +801,12 @@ alq_load_handler(module_t mod, int what,
 		}
 		break;
 
+	case MOD_UNLOAD:
+		/* If MOD_QUIESCE failed we must fail here too. */
+		if (ald_shutingdown == 0)
+			ret = EBUSY;
+		break;
+
 	default:
 		ret = EINVAL;
 		break;