diff options
| author | phk <phk@FreeBSD.org> | 1999-05-07 10:11:40 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-05-07 10:11:40 +0000 |
| commit | 693dd58bb3e5843d252e25a15e2cc8d49323cb82 (patch) | |
| tree | a0fbea49edf11184c1bafaed7d5b3cd858742449 /sys/kern/vfs_export.c | |
| parent | cfcd3ae08c30d66088e1ad5ffa68aa05b60e1bfe (diff) | |
| download | FreeBSD-src-693dd58bb3e5843d252e25a15e2cc8d49323cb82.zip FreeBSD-src-693dd58bb3e5843d252e25a15e2cc8d49323cb82.tar.gz | |
Continue where Julian left off in July 1998:
Virtualize bdevsw[] from cdevsw. bdevsw() is now an (inline)
function.
Join CDEV_MODULE and BDEV_MODULE to DEV_MODULE (please pay attention
to the order of the cmaj/bmaj arguments!)
Join CDEV_DRIVER_MODULE and BDEV_DRIVER_MODULE to DEV_DRIVER_MODULE
(ditto!)
(Next step will be to convert all bdev dev_t's to cdev dev_t's
before they get to do any damage^H^H^H^H^H^Hwork in the kernel.)
Diffstat (limited to 'sys/kern/vfs_export.c')
| -rw-r--r-- | sys/kern/vfs_export.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index abd32e2..258d8e5 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.189 1999/03/12 02:24:56 julian Exp $ + * $Id: vfs_subr.c,v 1.190 1999/05/03 23:57:24 billf Exp $ */ /* @@ -1177,7 +1177,7 @@ bdevvp(dev, vpp) /* XXX 255 is for mfs. */ if (dev == NODEV || (major(dev) != 255 && (major(dev) >= nblkdev || - bdevsw[major(dev)] == NULL))) { + bdevsw(major(dev)) == NULL))) { *vpp = NULLVP; return (ENXIO); } @@ -1275,9 +1275,9 @@ loop: */ if (nvp->v_type == VBLK && rmaj < nblkdev) { - if (bdevsw[rmaj] && bdevsw[rmaj]->d_parms) + if (bdevsw(rmaj) && bdevsw(rmaj)->d_parms) - (*bdevsw[rmaj]->d_parms)(nvp_rdev, sinfo, DPARM_GET); + (*bdevsw(rmaj)->d_parms)(nvp_rdev, sinfo, DPARM_GET); } else if (nvp->v_type == VCHR && rmaj < nchrdev) { if (cdevsw[rmaj] && cdevsw[rmaj]->d_parms) (*cdevsw[rmaj]->d_parms)(nvp_rdev, sinfo, DPARM_GET); @@ -2585,7 +2585,7 @@ retry: goto retn; object = vnode_pager_alloc(vp, vat.va_size, 0, 0); } else if (major(vp->v_rdev) < nblkdev && - bdevsw[major(vp->v_rdev)] != NULL) { + bdevsw(major(vp->v_rdev)) != NULL) { /* * This simply allocates the biggest object possible * for a VBLK vnode. This should be fixed, but doesn't |
