From owner-p4-projects@FreeBSD.ORG  Wed Jul 29 15:36:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E17FC106576D; Wed, 29 Jul 2009 15:36:44 +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 9D0DC1065732
	for <perforce@freebsd.org>; Wed, 29 Jul 2009 15:36:44 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A5B88FC1F
	for <perforce@freebsd.org>; Wed, 29 Jul 2009 15:36:44 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6TFaip6083548
	for <perforce@freebsd.org>; Wed, 29 Jul 2009 15:36:44 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6TFaiXf083546
	for perforce@freebsd.org; Wed, 29 Jul 2009 15:36:44 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 29 Jul 2009 15:36:44 GMT
Message-Id: <200907291536.n6TFaiXf083546@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 166735 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: Wed, 29 Jul 2009 15:36:46 -0000

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

Change 166735 by jhb@jhb_jhbbsd on 2009/07/29 15:35:51

	Another LOR between filedesc and vnode locks during mountroot.

Affected files ...

.. //depot/projects/smpng/sys/kern/vfs_mount.c#98 edit

Differences ...

==== //depot/projects/smpng/sys/kern/vfs_mount.c#98 (text+ko) ====

@@ -1481,6 +1481,8 @@
 	if (VFS_ROOT(TAILQ_FIRST(&mountlist), LK_EXCLUSIVE, &rootvnode))
 		panic("Cannot find root vnode");
 
+	VOP_UNLOCK(rootvnode, 0);
+
 	p = curthread->td_proc;
 	FILEDESC_XLOCK(p->p_fd);
 
@@ -1496,8 +1498,6 @@
 
 	FILEDESC_XUNLOCK(p->p_fd);
 
-	VOP_UNLOCK(rootvnode, 0);
-
 	EVENTHANDLER_INVOKE(mountroot);
 }