From ed3a2fb7b396c0dd2c06de8b795fd56229e8aab5 Mon Sep 17 00:00:00 2001 From: John Birrell Date: Mon, 24 May 1999 00:27:12 +0000 Subject: - Back out Luoqi's cdevsw stuff. It panics on my system and is not required. - Fix an error message. - Do the MFS_ROOT setting of mountrootfsname in mfs_init() instead of cpu_rootconf(). - Set rootdev in mfs_init instead of later in mfs_mount() iff MFS_ROOT. --- sys/ufs/mfs/mfs_vfsops.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'sys') diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index e3eb25b50695..c9e2ae84324f 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -209,11 +209,10 @@ mfs_mount(mp, path, data, ndp, p) mfs_rootbase = base; mfs_rootsize = fs->fs_fsize * fs->fs_size; - rootdev = makedev(255, mfs_minor++); printf("rootfs is %ld Kbyte compiled in MFS\n", mfs_rootsize/1024); if ((err = bdevvp(rootdev, &rootvp))) { - printf("mfs_mountroot: can't find rootvp"); + printf("mfs_mount: can't find rootvp - "); return (err); } @@ -453,8 +452,6 @@ mfs_statfs(mp, sbp, p) return (error); } -static struct cdevsw mfs_cdevsw = {}; - /* * Memory based filesystem initialization. */ @@ -462,8 +459,14 @@ static int mfs_init(vfsp) struct vfsconf *vfsp; { - dev_t dev = NODEV; - cdevsw_add(&dev, &mfs_cdevsw, NULL); - cdevsw_add_generic(255, major(dev), &mfs_cdevsw); +#ifdef MFS_ROOT + if (bootverbose) + printf("Considering MFS root f/s.\n"); + if (mfs_getimage()) { + mountrootfsname = "mfs"; + rootdev = makedev(255, mfs_minor++); + } else if (bootverbose) + printf("No MFS image available as root f/s.\n"); +#endif return (0); } -- cgit v1.3