summaryrefslogtreecommitdiffstats
path: root/sys/isofs
diff options
context:
space:
mode:
authorsos <sos@FreeBSD.org>1998-09-14 19:56:42 +0000
committersos <sos@FreeBSD.org>1998-09-14 19:56:42 +0000
commit8397655514874e9ac9c02380c3cc1013673ef3e8 (patch)
tree084072c8f496cd1095844d011436b8d56454e3d1 /sys/isofs
parent5468fdfd0c4063b52da159a8842649834a85de03 (diff)
downloadFreeBSD-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/isofs')
-rw-r--r--sys/isofs/cd9660/cd9660_vfsops.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 293fd96..fb877ca 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.42 1998/09/07 07:20:30 guido Exp $
+ * $Id: cd9660_vfsops.c,v 1.43 1998/09/07 13:17:00 bde Exp $
*/
#include <sys/param.h>
@@ -143,10 +143,6 @@ iso_get_ssector(dev, p)
#ifndef VFS_LKM /* mount root makes no sense to an LKM */
-#include "opt_devfs.h" /* for SLICE */
-#ifdef SLICE
-extern struct vnode *root_device_vnode;
-#endif
static int iso_mountroot __P((struct mount *mp, struct proc *p));
static int
@@ -157,18 +153,10 @@ iso_mountroot(mp, p)
struct iso_args args;
int error;
-#ifdef SLICE
- rootvp = root_device_vnode;
- if (rootvp == NULL) {
- printf("cd9660_mountroot: rootvp not set");
- return (EINVAL);
- }
-#else
if ((error = bdevvp(rootdev, &rootvp))) {
printf("iso_mountroot: can't find rootvp");
return (error);
}
-#endif
args.flags = ISOFSMNT_ROOT;
args.ssector = iso_get_ssector(rootdev, p);
if (bootverbose)
OpenPOWER on IntegriCloud