diff options
| author | sos <sos@FreeBSD.org> | 1998-09-14 19:56:42 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 1998-09-14 19:56:42 +0000 |
| commit | 8397655514874e9ac9c02380c3cc1013673ef3e8 (patch) | |
| tree | 084072c8f496cd1095844d011436b8d56454e3d1 /sys/ufs | |
| parent | 5468fdfd0c4063b52da159a8842649834a85de03 (diff) | |
| download | FreeBSD-src-8397655514874e9ac9c02380c3cc1013673ef3e8.zip FreeBSD-src-8397655514874e9ac9c02380c3cc1013673ef3e8.tar.gz | |
Remove the SLICE code.
This clearly needs alot more thought, and we dont need this to hunt
us down in 3.0-RELEASE.
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 14 | ||||
| -rw-r--r-- | sys/ufs/mfs/mfs_vfsops.c | 10 |
2 files changed, 2 insertions, 22 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 41ac074..6aaad3a 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,10 +31,9 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 - * $Id: ffs_vfsops.c,v 1.85 1998/08/17 19:09:36 bde Exp $ + * $Id: ffs_vfsops.c,v 1.86 1998/09/07 13:17:06 bde Exp $ */ -#include "opt_devfs.h" /* for SLICE */ #include "opt_quota.h" #include <sys/param.h> @@ -126,9 +125,6 @@ VFS_SET(ufs_vfsops, ufs, 0); * system call will fail with EFAULT in copyinstr in * namei() if it is a genuine NULL from the user. */ -#ifdef SLICE -extern struct vnode *root_device_vnode; -#endif static int ffs_mount( mp, path, data, ndp, p) struct mount *mp; /* mount struct pointer*/ @@ -158,13 +154,6 @@ ffs_mount( mp, path, data, ndp, p) *** */ -#ifdef SLICE - rootvp = root_device_vnode; - if (rootvp == NULL) { - printf("ffs_mountroot: rootvp not set"); - return (EINVAL); - } -#else /* !SLICE */ if ((err = bdevvp(rootdev, &rootvp))) { printf("ffs_mountroot: can't find rootvp"); return (err); @@ -174,7 +163,6 @@ ffs_mount( mp, path, data, ndp, p) mp->mnt_flag |= MNT_NOCLUSTERR; if (bdevsw[major(rootdev)]->d_flags & D_NOCLUSTERW) mp->mnt_flag |= MNT_NOCLUSTERW; -#endif /* !SLICE */ if( ( err = ffs_mountfs(rootvp, mp, p, M_FFSNODE)) != 0) { /* fs specific cleanup (if any)*/ goto error_1; diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index e44e6bc..37e276a 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -31,12 +31,11 @@ * SUCH DAMAGE. * * @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95 - * $Id: mfs_vfsops.c,v 1.43 1998/05/11 19:27:18 julian Exp $ + * $Id: mfs_vfsops.c,v 1.44 1998/09/07 13:17:06 bde Exp $ */ #include "opt_mfs.h" -#include "opt_devfs.h" /* for SLICE */ #include <sys/param.h> #include <sys/systm.h> @@ -104,9 +103,6 @@ static struct vfsops mfs_vfsops = { VFS_SET(mfs_vfsops, 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"; @@ -281,14 +277,10 @@ 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 |
