From owner-p4-projects@FreeBSD.ORG  Tue Apr  8 01:26:54 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 57BE41065672; Tue,  8 Apr 2008 01:26:54 +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 1876C106566C
	for <perforce@freebsd.org>; Tue,  8 Apr 2008 01:26:54 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 044D58FC19
	for <perforce@freebsd.org>; Tue,  8 Apr 2008 01:26:54 +0000 (UTC)
	(envelope-from sam@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 m381QrIU019925
	for <perforce@freebsd.org>; Tue, 8 Apr 2008 01:26:53 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m381Qqw0019922
	for perforce@freebsd.org; Tue, 8 Apr 2008 01:26:52 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 8 Apr 2008 01:26:52 GMT
Message-Id: <200804080126.m381Qqw0019922@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139549 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, 08 Apr 2008 01:26:54 -0000

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

Change 139549 by sam@sam_ebb on 2008/04/08 01:26:37

	handle the case where we're loaded after root is mounted
	Submitted by:	mlaier

Affected files ...

.. //depot/projects/vap/sys/kern/subr_firmware.c#4 edit

Differences ...

==== //depot/projects/vap/sys/kern/subr_firmware.c#4 (text+ko) ====

@@ -388,7 +388,7 @@
 }
 
 /*
- * Event handler called on mounting of /.  Bounce a task
+ * Event handler called on mounting of /; bounce a task
  * into the task queue thread to setup it's directories.
  */
 static void
@@ -475,6 +475,13 @@
 		/* NB: use our own loop routine that sets up context */
 		(void) taskqueue_start_threads(&firmware_tq, 1, PWAIT,
 		    "firmware taskq");
+		if (rootvnode != NULL) {
+			/* 
+			 * Root is already mounted so we won't get an event;
+			 * simulate one here.
+			 */
+			firmware_mountroot(NULL);
+		}
 		return 0;
 
 	case MOD_UNLOAD: