svn commit: r204945 - user/lstewart/alq_varlen_head/sys/kern

Lawrence Stewart lstewart at FreeBSD.org
Wed Mar 10 07:25:17 UTC 2010


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;


More information about the svn-src-user mailing list