From owner-p4-projects@FreeBSD.ORG  Thu Jun  7 02:31:36 2007
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 B343916A530; Thu,  7 Jun 2007 02:31:36 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 722C316A507
	for <perforce@freebsd.org>; Thu,  7 Jun 2007 02:31:36 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 39F2813C448
	for <perforce@freebsd.org>; Thu,  7 Jun 2007 02:31:36 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l572VaJt064633
	for <perforce@freebsd.org>; Thu, 7 Jun 2007 02:31:36 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l572VZ0C064623
	for perforce@freebsd.org; Thu, 7 Jun 2007 02:31:35 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 7 Jun 2007 02:31:35 GMT
Message-Id: <200706070231.l572VZ0C064623@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 121119 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: Thu, 07 Jun 2007 02:31:37 -0000

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

Change 121119 by peter@peter_daintree on 2007/06/07 02:31:16

	After a device has attached, allow for the possibility that it has
	done a device_set_unit() to rename itself.  Recompute the sysctl tree
	node name that we attach under.

Affected files ...

.. //depot/projects/hammer/sys/kern/subr_bus.c#53 edit

Differences ...

==== //depot/projects/hammer/sys/kern/subr_bus.c#53 (text+ko) ====

@@ -307,6 +307,16 @@
 }
 
 static void
+device_sysctl_update(device_t dev)
+{
+	devclass_t dc = dev->devclass;
+
+	if (dev->sysctl_tree == NULL)
+		return;
+	sysctl_rename_oid(dev->sysctl_tree, dev->nameunit + strlen(dc->name));
+}
+
+static void
 device_sysctl_fini(device_t dev)
 {
 	if (dev->sysctl_tree == NULL)
@@ -2387,6 +2397,7 @@
 		dev->state = DS_NOTPRESENT;
 		return (error);
 	}
+	device_sysctl_update(dev);
 	dev->state = DS_ATTACHED;
 	devadded(dev);
 	return (0);