From 0cbed5937d3a8e4780a457172e67973184bc9f2f Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 24 Jul 2003 20:43:18 +0000 Subject: [PATCH] Have MFS register a device as a VCHR instead of VBLK, fixing a panic. Report-by: Joerg Sonnenberger --- sys/vfs/mfs/mfs_vfsops.c | 4 ++-- sys/vfs/mfs/mfs_vnops.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/vfs/mfs/mfs_vfsops.c b/sys/vfs/mfs/mfs_vfsops.c index 10a1796a2b..81b4c87617 100644 --- a/sys/vfs/mfs/mfs_vfsops.c +++ b/sys/vfs/mfs/mfs_vfsops.c @@ -32,7 +32,7 @@ * * @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95 * $FreeBSD: src/sys/ufs/mfs/mfs_vfsops.c,v 1.81.2.3 2001/07/04 17:35:21 tegge Exp $ - * $DragonFly: src/sys/vfs/mfs/mfs_vfsops.c,v 1.7 2003/07/21 05:50:47 dillon Exp $ + * $DragonFly: src/sys/vfs/mfs/mfs_vfsops.c,v 1.8 2003/07/24 20:43:18 dillon Exp $ */ @@ -248,7 +248,7 @@ mfs_mount(mp, path, data, ndp, td) 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/vfs/mfs/mfs_vnops.c b/sys/vfs/mfs/mfs_vnops.c index 1c87d47df4..3e9aa0e404 100644 --- a/sys/vfs/mfs/mfs_vnops.c +++ b/sys/vfs/mfs/mfs_vnops.c @@ -32,7 +32,7 @@ * * @(#)mfs_vnops.c 8.11 (Berkeley) 5/22/95 * $FreeBSD: src/sys/ufs/mfs/mfs_vnops.c,v 1.47.2.1 2001/05/22 02:06:43 bp Exp $ - * $DragonFly: src/sys/vfs/mfs/mfs_vnops.c,v 1.6 2003/06/26 05:55:21 dillon Exp $ + * $DragonFly: src/sys/vfs/mfs/mfs_vnops.c,v 1.7 2003/07/24 20:43:18 dillon Exp $ */ #include @@ -111,8 +111,8 @@ mfs_open(ap) } */ *ap; { - if (ap->a_vp->v_type != VBLK) { - panic("mfs_open not VBLK"); + if (ap->a_vp->v_type != VCHR) { + panic("mfs_open not VCHR"); /* NOTREACHED */ } return (0); @@ -148,7 +148,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); @@ -178,7 +178,7 @@ mfs_strategy(ap) struct thread *td = curthread; /* 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); -- 2.41.0