From owner-p4-projects@FreeBSD.ORG  Tue Nov 14 16:21:04 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 C335E16A62F; Tue, 14 Nov 2006 16:21:03 +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 8B36316A622
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 16:21:03 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7923243DC1
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 16:11:53 +0000 (GMT)
	(envelope-from millert@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 kAEGBeMe073257
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 16:11:40 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAEGBeoF073253
	for perforce@freebsd.org; Tue, 14 Nov 2006 16:11:40 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 14 Nov 2006 16:11:40 GMT
Message-Id: <200611141611.kAEGBeoF073253@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109935 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, 14 Nov 2006 16:21:05 -0000

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

Change 109935 by millert@millert_g5tower on 2006/11/14 16:11:20

	In vfs_mountroot() failure of VFS_ROOT() and vnode_label()
	should result in filesystem being unmounted.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_subr.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_subr.c#7 (text+ko) ====

@@ -951,16 +951,24 @@
 
 			error = VFS_ROOT(mp, &vp, &context);
 			if (error) {
-				printf("%s() VFS_ROOT returned %d\n",
+				printf("%s() VFS_ROOT() returned %d\n",
 				    __func__, error);
-				return (error);
+				dounmount(mp, MNT_FORCE, context.vc_proc);
+				goto fail;
 			}
 
 			/* VFS_ROOT provides reference so flags = 0 */
 			error = vnode_label(mp, NULL, vp, NULL, 0, &context);
+			if (error) {
+				printf("%s() vnode_label() returned %d\n",
+				    __func__, error);
+				dounmount(mp, MNT_FORCE, context.vc_proc);
+				goto fail;
+			}
 #endif
-			return (error);
+			return (0);
 		}
+fail:
 		vfs_rootmountfailed(mp);
 		
 		if (error != EINVAL)