From owner-svn-src-head@FreeBSD.ORG  Tue Dec 23 20:43:42 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 629ED1065676;
	Tue, 23 Dec 2008 20:43:42 +0000 (UTC)
	(envelope-from marcus@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5022C8FC1E;
	Tue, 23 Dec 2008 20:43:42 +0000 (UTC)
	(envelope-from marcus@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBNKhgLK013133;
	Tue, 23 Dec 2008 20:43:42 GMT (envelope-from marcus@svn.freebsd.org)
Received: (from marcus@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBNKhgkJ013132;
	Tue, 23 Dec 2008 20:43:42 GMT (envelope-from marcus@svn.freebsd.org)
Message-Id: <200812232043.mBNKhgkJ013132@svn.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Tue, 23 Dec 2008 20:43:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186458 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Dec 2008 20:43:42 -0000

Author: marcus (doc,ports committer)
Date: Tue Dec 23 20:43:42 2008
New Revision: 186458
URL: http://svn.freebsd.org/changeset/base/186458

Log:
  Do not KASSERT when vp->v_dd is NULL.  Only directories which have had ".."
  looked up would have v_dd set to a non-NULL value.  This fixes a panic
  seen when running installworld on a diskless system with a separate /usr
  file system.
  
  Submitted by:	cracauer
  Approved by:	kib

Modified:
  head/sys/kern/vfs_cache.c

Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c	Tue Dec 23 20:25:04 2008	(r186457)
+++ head/sys/kern/vfs_cache.c	Tue Dec 23 20:43:42 2008	(r186458)
@@ -936,7 +936,7 @@ vn_fullpath1(struct thread *td, struct v
 		}
 		ncp = TAILQ_FIRST(&vp->v_cache_dst);
 		if (ncp != NULL) {
-			MPASS(ncp->nc_dvp == vp->v_dd);
+			MPASS(vp->v_dd == NULL || ncp->nc_dvp == vp->v_dd);
 			buflen -= ncp->nc_nlen - 1;
 			for (i = ncp->nc_nlen - 1; i >= 0 && bp != buf; i--)
 				*--bp = ncp->nc_name[i];