From owner-p4-projects@FreeBSD.ORG  Sat Apr 22 23:28:20 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 574A116A403; Sat, 22 Apr 2006 23:28:20 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 34D7616A400
	for <perforce@freebsd.org>; Sat, 22 Apr 2006 23:28:20 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F41A443D48
	for <perforce@freebsd.org>; Sat, 22 Apr 2006 23:28:19 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3MNSJpl014841
	for <perforce@freebsd.org>; Sat, 22 Apr 2006 23:28:19 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3MNSJh5014838
	for perforce@freebsd.org; Sat, 22 Apr 2006 23:28:19 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 22 Apr 2006 23:28:19 GMT
Message-Id: <200604222328.k3MNSJh5014838@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95901 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Apr 2006 23:28:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=95901

Change 95901 by jb@jb_freebsd2 on 2006/04/22 23:27:57

	If the module failed to unload because it is still busy, don't
	try to deregister the event handler the next time around. Doing
	that causes a panic.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_modevent.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_modevent.c#4 (text+ko) ====

@@ -40,11 +40,18 @@
 		break;
 
 	case MOD_UNLOAD:
-		/* De-register the device cloning event handler. */
-		EVENTHANDLER_DEREGISTER(dev_clone, eh_tag);
+		/*
+		 * Check if there is still an event handler callback
+		 * registered.
+		 */
+		if (eh_tag != 0) {
+			/* De-register the device cloning event handler. */
+			EVENTHANDLER_DEREGISTER(dev_clone, eh_tag);
+			eh_tag = 0;
 
-		/* Stop device cloning. */
-		clone_cleanup(&dtrace_clones);
+			/* Stop device cloning. */
+			clone_cleanup(&dtrace_clones);
+		}
 
 		error = dtrace_unload();
 		break;