From 60b7529f2ddfd2c1fa3ffdce4896a2de5aa44219 Mon Sep 17 00:00:00 2001
From: jb <jb@FreeBSD.org>
Date: Mon, 24 May 1999 00:37:26 +0000
Subject: Back out my previous change (phk didn't like it) in favour of setting
 rootdev in the mfs initialisation code iff MFS_ROOT (which Bruce doesn't
 like). Damned if I do - damned if I don't.

---
 sys/kern/vfs_mount.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'sys/kern/vfs_mount.c')

diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index ab92484..665d52f 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.26 1998/09/14 19:56:40 sos Exp $
+ * $Id: vfs_conf.c,v 1.27 1999/05/23 10:51:33 jb Exp $
  */
 
 /*
@@ -52,7 +52,6 @@
  *		on SMP reentrancy
  */
 #include "opt_bootp.h"
-#include "opt_mfs.h"
 
 #include <sys/param.h>		/* dev_t (types.h)*/
 #include <sys/kernel.h>
@@ -119,10 +118,8 @@ vfs_mountrootfs(void *unused)
 	struct mount		*mp;
 	int			err;
 	struct proc		*p = curproc;	/* XXX */
-#ifndef MFS_ROOT
 	int			i;
 	dev_t			orootdev;
-#endif
 
 #ifdef BOOTP
 	bootpc_init();
@@ -140,9 +137,6 @@ vfs_mountrootfs(void *unused)
 	/*
 	 * Attempt the mount
 	 */
-#ifdef	MFS_ROOT
-	err = VFS_MOUNT(mp, NULL, NULL, NULL, p);
-#else
 	err = ENXIO;
 	orootdev = rootdev;
 	if (rootdevs[0] == NODEV)
@@ -161,7 +155,6 @@ vfs_mountrootfs(void *unused)
 		if (err != ENXIO)
 			break;
 	}
-#endif
 	if (err) {
 		/*
 		 * XXX should ask the user for the name in some cases.
-- 
cgit v1.1