aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJulian Elischer <julian@FreeBSD.org>1998-05-11 19:27:18 +0000
committerJulian Elischer <julian@FreeBSD.org>1998-05-11 19:27:18 +0000
commit336c78bb908b71d962b7ac0675990523767b3859 (patch)
tree176bf4338563ba7c5502d28489e1647ce3567eaa /sys
parent2ec8b6deeae468cb2c2317f3948ec077a43c0c77 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/ufs/mfs/mfs_vfsops.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index d0d663e09bef..3032694bf8e3 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,10 +31,12 @@
* SUCH DAMAGE.
*
* @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95
- * $Id: mfs_vfsops.c,v 1.41 1998/03/01 22:46:53 msmith Exp $
+ * $Id: mfs_vfsops.c,v 1.42 1998/05/06 05:29:41 msmith Exp $
*/
+
#include "opt_mfs.h"
+#include "opt_devfs.h" /* for SLICE */
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,6 +104,9 @@ static struct vfsops mfs_vfsops = {
VFS_SET(mfs_vfsops, mfs, MOUNT_MFS, 0);
+#ifdef SLICE
+ extern struct vnode *root_device_vnode;
+#endif /* SLICE */
#ifdef MFS_ROOT
static u_char mfs_root[MFS_ROOT*1024] = "MFS Filesystem goes here";
@@ -276,10 +281,14 @@ mfs_mount(mp, path, data, ndp, p)
rootdev = makedev(255, mfs_minor++);
printf("rootfs is %ld Kbyte compiled in MFS\n",
mfs_rootsize/1024);
+#ifdef SLICE
+ rootvp=root_device_vnode;
+#else /* !SLICE */
if ((err = bdevvp(rootdev, &rootvp))) {
printf("mfs_mountroot: can't find rootvp");
return (err);
}
+#endif /* !SLICE */
/*
* FS specific handling