diff options
author | bde <bde@FreeBSD.org> | 1997-09-07 16:21:11 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-09-07 16:21:11 +0000 |
commit | bcade9a9035125a9249e03bbdaccb94f1d84ffc7 (patch) | |
tree | e467faa382879278c2ee894344a80c6c0ef297b5 /sys/ufs | |
parent | caa2e7e2da294fd9afa91fec5201e2e7cd44ba9b (diff) | |
download | FreeBSD-src-bcade9a9035125a9249e03bbdaccb94f1d84ffc7.zip FreeBSD-src-bcade9a9035125a9249e03bbdaccb94f1d84ffc7.tar.gz |
Removed yet more vestiges of config-time swap configuration and/or
cleaned up nearby cruft.
Diffstat (limited to 'sys/ufs')
-rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 7 | ||||
-rw-r--r-- | sys/ufs/lfs/lfs_vfsops.c | 12 | ||||
-rw-r--r-- | sys/ufs/mfs/mfs_vfsops.c | 9 |
3 files changed, 10 insertions, 18 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 14ef397..a835da5 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 - * $Id: ffs_vfsops.c,v 1.53 1997/08/16 19:16:20 wollman Exp $ + * $Id: ffs_vfsops.c,v 1.54 1997/09/02 20:06:46 bde Exp $ */ #include "opt_quota.h" @@ -150,9 +150,8 @@ ffs_mount( mp, path, data, ndp, p) *** */ - /* Get vnode for root device*/ - if ((err = bdevvp( rootdev, &rootvp))) { - printf("ffs_mountroot: can't setup bdevvp for root"); + if ((err = bdevvp(rootdev, &rootvp))) { + printf("ffs_mountroot: can't find rootvp"); return (err); } diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c index b4fef3d..a0bf515 100644 --- a/sys/ufs/lfs/lfs_vfsops.c +++ b/sys/ufs/lfs/lfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_vfsops.c 8.20 (Berkeley) 6/10/95 - * $Id: lfs_vfsops.c,v 1.20 1997/08/02 14:33:21 bde Exp $ + * $Id: lfs_vfsops.c,v 1.21 1997/08/16 19:16:23 wollman Exp $ */ #include "opt_quota.h" @@ -99,12 +99,8 @@ lfs_mountroot() struct proc *p = curproc; /* XXX */ int error; - /* - * Get vnodes for swapdev and rootdev. - */ - if ((error = bdevvp(swapdev, &swapdev_vp)) || - (error = bdevvp(rootdev, &rootvp))) { - printf("lfs_mountroot: can't setup bdevvp's"); + if ((error = bdevvp(rootdev, &rootvp))) { + printf("lfs_mountroot: can't find rootvp"); return (error); } if (error = vfs_rootmountalloc("lfs", "root_device", &mp)) @@ -189,7 +185,7 @@ lfs_mount(mp, path, data, ndp, p) */ /* XXX -- implement*/ - panic("lfs_mountroot: can't setup bdevvp for root"); + panic("lfs_mount: NULL path not implemented"); } /* diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index 5f4f371..0b05469 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95 - * $Id: mfs_vfsops.c,v 1.30 1997/04/28 09:15:18 jkh Exp $ + * $Id: mfs_vfsops.c,v 1.31 1997/09/02 20:06:55 bde Exp $ */ #include <sys/param.h> @@ -272,11 +272,8 @@ mfs_mount(mp, path, data, ndp, p) rootdev = makedev(255, mfs_minor++); printf("rootfs is %ld Kbyte compiled in MFS\n", mfs_rootsize/1024); - - - /* Get vnode for root device*/ - if (err = bdevvp( rootdev, &rootvp)) { - printf("mfs_mountroot: can't setup bdevvp for rootdev"); + if ((err = bdevvp(rootdev, &rootvp))) { + printf("mfs_mountroot: can't find rootvp"); return (err); } |