From owner-p4-projects@FreeBSD.ORG  Tue Apr 22 05:52:06 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9EAF21065673; Tue, 22 Apr 2008 05:52:06 +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 5FD681065672
	for <perforce@freebsd.org>; Tue, 22 Apr 2008 05:52:06 +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 5159D8FC1D
	for <perforce@freebsd.org>; Tue, 22 Apr 2008 05:52:06 +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 m3M5q6Ew096741
	for <perforce@freebsd.org>; Tue, 22 Apr 2008 05:52:06 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3M5q6WY096739
	for perforce@freebsd.org; Tue, 22 Apr 2008 05:52:06 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 05:52:06 GMT
Message-Id: <200804220552.m3M5q6WY096739@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 140384 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: Tue, 22 Apr 2008 05:52:06 -0000

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

Change 140384 by jb@freebsd3 on 2008/04/22 05:51:27

	Update the BSD ioctl function to suit the IFopensolaris.
	
	It's a shame that BSD and SYSV ioctl designs differ so much that we have
	to have a separate code base. Sigh.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#22 edit

Differences ...

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

@@ -342,13 +342,9 @@
 		 * cue to reevaluate our enablings.
 		 */
 		if (p->dof == NULL) {
-			mutex_enter(&cpu_lock);
-			mutex_enter(&dtrace_lock);
-			err = dtrace_enabling_matchstate(state, &p->n_matched);
-			mutex_exit(&dtrace_lock);
-			mutex_exit(&cpu_lock);
+			dtrace_enabling_matchall();
 
-			return (err);
+			return (0);
 		}
 
 		if ((dof = dtrace_dof_copyin((uintptr_t) p->dof, &rval)) == NULL)