diff options
author | phk <phk@FreeBSD.org> | 2000-04-22 05:45:38 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2000-04-22 05:45:38 +0000 |
commit | 7473110e204b802c2df2bd0274467a2d2ab5e595 (patch) | |
tree | 3594c78eae8148aec5ee06c4c88b5314a055c2b8 /sys/ufs | |
parent | 365f24a27a5704214747b929b22b3ec6e0e651b4 (diff) | |
download | FreeBSD-src-7473110e204b802c2df2bd0274467a2d2ab5e595.zip FreeBSD-src-7473110e204b802c2df2bd0274467a2d2ab5e595.tar.gz |
Convert the magic MFS device to a VCHR.
Detected by: obrien
Diffstat (limited to 'sys/ufs')
-rw-r--r-- | sys/ufs/mfs/mfs_vfsops.c | 2 | ||||
-rw-r--r-- | sys/ufs/mfs/mfs_vnops.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index 2739f87..13ddd8e 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -242,7 +242,7 @@ mfs_mount(mp, path, data, ndp, p) FREE(mfsp, M_MFSNODE); goto error_1; } - devvp->v_type = VBLK; + devvp->v_type = VCHR; dev = make_dev(&mfs_cdevsw, mfs_minor, 0, 0, 0, "MFS%d", mfs_minor); /* It is not clear that these will get initialized otherwise */ dev->si_bsize_phys = DEV_BSIZE; diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index 7ef7ed0..9cb097a 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -104,10 +104,8 @@ mfs_open(ap) } */ *ap; { - if (ap->a_vp->v_type != VBLK) { - panic("mfs_open not VBLK"); - /* NOTREACHED */ - } + if (ap->a_vp->v_type != VCHR) + panic("mfs_open not VCHR"); return (0); } @@ -141,7 +139,7 @@ mfs_freeblks(ap) struct buf *bp; struct vnode *vp; - if (!vfinddev(ap->a_vp->v_rdev, VBLK, &vp) || vp->v_usecount == 0) + if (!vfinddev(ap->a_vp->v_rdev, VCHR, &vp) || vp->v_usecount == 0) panic("mfs_freeblks: bad dev"); bp = geteblk(ap->a_length); @@ -172,7 +170,7 @@ mfs_strategy(ap) struct proc *p = curproc; /* XXX */ int s; - if (!vfinddev(bp->b_dev, VBLK, &vp) || vp->v_usecount == 0) + if (!vfinddev(bp->b_dev, VCHR, &vp) || vp->v_usecount == 0) panic("mfs_strategy: bad dev"); mfsp = VTOMFS(vp); |