From owner-p4-projects@FreeBSD.ORG  Mon Jun 26 05:32:19 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 CA6F716A406; Mon, 26 Jun 2006 05:32:19 +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 6815116A400
	for <perforce@freebsd.org>; Mon, 26 Jun 2006 05:32:19 +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 4A9D243D92
	for <perforce@freebsd.org>; Mon, 26 Jun 2006 05:32:17 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5Q5WHC7019731
	for <perforce@freebsd.org>; Mon, 26 Jun 2006 05:32:17 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5Q5WGmD019726
	for perforce@freebsd.org; Mon, 26 Jun 2006 05:32:16 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 26 Jun 2006 05:32:16 GMT
Message-Id: <200606260532.k5Q5WGmD019726@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 100023 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: Mon, 26 Jun 2006 05:32:20 -0000

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

Change 100023 by jb@jb_freebsd2 on 2006/06/26 05:31:32

	Add a bit of missing code required for anonymous enablings. Without
	this you get the infamous "no such file" error. 8-)
	
	Remove the demo sdt probe in preparation for changing the SDT provider
	to use invops like Sun does.

Affected files ...

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

Differences ...

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

@@ -32,8 +32,6 @@
 	if (state == NULL)
 		return (EINVAL);
 
-	SDT_PROBE(dtrace, ioctl, entry, cmd, addr, 0, 0, 0);
-
 #if defined(__i386__)
 	/*
 	 * Check if any probe recursions have occurred. These are more
@@ -46,6 +44,11 @@
 	}
 #endif
 
+	if (state->dts_anon) {
+		ASSERT(dtrace_anon.dta_state == NULL);
+		state = state->dts_anon;
+	}
+
 	switch (cmd) {
 	case DTRACEIOC_AGGDESC: {
 		dtrace_aggdesc_t **paggdesc = (dtrace_aggdesc_t **) addr;