summaryrefslogtreecommitdiffstats
path: root/sys/kern/vfs_export.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern/vfs_export.c')
-rw-r--r--sys/kern/vfs_export.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 258d8e5..c33406e 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.190 1999/05/03 23:57:24 billf Exp $
+ * $Id: vfs_subr.c,v 1.191 1999/05/07 10:10:58 phk 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(dev) == NULL))) {
*vpp = NULLVP;
return (ENXIO);
}
@@ -1275,12 +1275,12 @@ loop:
*/
if (nvp->v_type == VBLK && rmaj < nblkdev) {
- if (bdevsw(rmaj) && bdevsw(rmaj)->d_parms)
+ if (bdevsw(nvp_rdev) && bdevsw(nvp_rdev)->d_parms)
- (*bdevsw(rmaj)->d_parms)(nvp_rdev, sinfo, DPARM_GET);
+ (*bdevsw(nvp_rdev)->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);
+ if (devsw(nvp_rdev) && devsw(nvp_rdev)->d_parms)
+ (*devsw(nvp_rdev)->d_parms)(nvp_rdev, sinfo, DPARM_GET);
}
simple_unlock(&spechash_slock);
@@ -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(vp->v_rdev) != NULL) {
/*
* This simply allocates the biggest object possible
* for a VBLK vnode. This should be fixed, but doesn't
OpenPOWER on IntegriCloud