From owner-p4-projects@FreeBSD.ORG  Sun Dec 30 21:48:08 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D22A216A421; Sun, 30 Dec 2007 21:48:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9802616A41B
	for <perforce@freebsd.org>; Sun, 30 Dec 2007 21:48:07 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A40413C467
	for <perforce@freebsd.org>; Sun, 30 Dec 2007 21:48:07 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBULm7bG092404
	for <perforce@freebsd.org>; Sun, 30 Dec 2007 21:48:07 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBULm7Ep092401
	for perforce@freebsd.org; Sun, 30 Dec 2007 21:48:07 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 30 Dec 2007 21:48:07 GMT
Message-Id: <200712302148.lBULm7Ep092401@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 132128 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: Sun, 30 Dec 2007 21:48:08 -0000

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

Change 132128 by jb@jb_freebsd1 on 2007/12/30 21:47:07

	Move the event handler cleanup code from modevent to here so that
	the SYSUINIT drivers it.
	
	Use FreeBSD error values rather than the DDI_FAILURE hack.
	
	Remove some OpenSolaris-specific code.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#16 edit

Differences ...

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

@@ -22,14 +22,25 @@
  *
  */
 
-#define	DDI_FAILURE	EBUSY
-
 static int
 dtrace_unload()
 {
 	dtrace_state_t *state;
 	int error = 0;
 
+	/*
+	 * 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);
+	}
+
 	mutex_enter(&cpu_lock);
 	mutex_enter(&dtrace_provider_lock);
 	mutex_enter(&dtrace_lock);
@@ -40,14 +51,14 @@
 		mutex_exit(&dtrace_provider_lock);
 		mutex_exit(&dtrace_lock);
 		mutex_exit(&cpu_lock);
-		return (DDI_FAILURE);
+		return (EBUSY);
 	}
 
 	if (dtrace_unregister((dtrace_provider_id_t)dtrace_provider) != 0) {
 		mutex_exit(&dtrace_provider_lock);
 		mutex_exit(&dtrace_lock);
 		mutex_exit(&cpu_lock);
-		return (DDI_FAILURE);
+		return (EBUSY);
 	}
 
 	dtrace_provider = NULL;
@@ -120,13 +131,6 @@
 		dtrace_toxranges_max = 0;
 	}
 
-#ifdef DOODAD
-	ddi_remove_minor_node(dtrace_devi, NULL);
-	dtrace_devi = NULL;
-
-	ddi_soft_state_fini(&dtrace_softstate);
-#endif
-
 	ASSERT(dtrace_vtime_references == 0);
 	ASSERT(dtrace_opens == 0);
 	ASSERT(dtrace_retained == NULL);