summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c12
-rw-r--r--sys/fs/msdosfs/msdosfs_vfsops.c4
-rw-r--r--sys/fs/specfs/spec_vnops.c22
3 files changed, 19 insertions, 19 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 5507a1a..d10f49c 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.52 1999/04/18 10:58:02 dcs Exp $
+ * $Id: cd9660_vfsops.c,v 1.53 1999/04/27 11:15:47 phk Exp $
*/
#include <sys/param.h>
@@ -118,7 +118,7 @@ iso_get_ssector(dev, p)
struct cdevsw *bd;
d_ioctl_t *ioctlp;
- bd = bdevsw[major(dev)];
+ bd = bdevsw(major(dev));
ioctlp = bd->d_ioctl;
if (ioctlp == NULL)
return 0;
@@ -189,7 +189,7 @@ cd9660_mount(mp, path, data, ndp, p)
struct iso_mnt *imp = 0;
if ((mp->mnt_flag & MNT_ROOTFS) != 0) {
- if (bdevsw[major(rootdev)]->d_flags & D_NOCLUSTERR)
+ if (bdevsw(major(rootdev))->d_flags & D_NOCLUSTERR)
mp->mnt_flag |= MNT_NOCLUSTERR;
return (iso_mountroot(mp, p));
}
@@ -206,7 +206,7 @@ cd9660_mount(mp, path, data, ndp, p)
*/
if (mp->mnt_flag & MNT_UPDATE) {
imp = VFSTOISOFS(mp);
- if (bdevsw[major(imp->im_devvp->v_rdev)]->d_flags &
+ if (bdevsw(major(imp->im_devvp->v_rdev))->d_flags &
D_NOCLUSTERR)
mp->mnt_flag |= MNT_NOCLUSTERR;
if (args.fspec == 0)
@@ -226,7 +226,7 @@ cd9660_mount(mp, path, data, ndp, p)
return ENOTBLK;
}
if (major(devvp->v_rdev) >= nblkdev ||
- bdevsw[major(devvp->v_rdev)] == NULL) {
+ bdevsw(major(devvp->v_rdev)) == NULL) {
vrele(devvp);
return ENXIO;
}
@@ -247,7 +247,7 @@ cd9660_mount(mp, path, data, ndp, p)
VOP_UNLOCK(devvp, 0, p);
if ((mp->mnt_flag & MNT_UPDATE) == 0) {
- if (bdevsw[major(devvp->v_rdev)]->d_flags & D_NOCLUSTERR)
+ if (bdevsw(major(devvp->v_rdev))->d_flags & D_NOCLUSTERR)
mp->mnt_flag |= MNT_NOCLUSTERR;
error = iso_mountfs(devvp, mp, p, &args);
} else {
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 4fcbe0b..c062519 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vfsops.c,v 1.41 1999/03/28 23:00:33 dt Exp $ */
+/* $Id: msdosfs_vfsops.c,v 1.42 1999/05/06 18:12:50 peter Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
/*-
@@ -299,7 +299,7 @@ msdosfs_mount(mp, path, data, ndp, p)
return (ENOTBLK);
}
if (major(devvp->v_rdev) >= nblkdev ||
- bdevsw[major(devvp->v_rdev)] == NULL) {
+ bdevsw(major(devvp->v_rdev)) == NULL) {
vrele(devvp);
return (ENXIO);
}
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index a3ee89f..63f2b36 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.82 1999/04/05 19:38:30 julian Exp $
+ * $Id: spec_vnops.c,v 1.83 1999/05/06 20:00:27 phk Exp $
*/
#include <sys/param.h>
@@ -214,7 +214,7 @@ spec_open(ap)
case VBLK:
if ((u_int)maj >= nblkdev)
return (ENXIO);
- if ( (bdevsw[maj] == NULL) || (bdevsw[maj]->d_open == NULL))
+ if ( (bdevsw(maj) == NULL) || (bdevsw(maj)->d_open == NULL))
return ENXIO;
/*
* When running in very secure mode, do not allow
@@ -222,7 +222,7 @@ spec_open(ap)
*/
if (securelevel >= 2 && ap->a_cred != FSCRED &&
(ap->a_mode & FWRITE) &&
- (bdevsw[maj]->d_flags & D_TYPEMASK) == D_DISK)
+ (bdevsw(maj)->d_flags & D_TYPEMASK) == D_DISK)
return (EPERM);
/*
@@ -232,7 +232,7 @@ spec_open(ap)
error = vfs_mountedon(vp);
if (error)
return (error);
- return ((*bdevsw[maj]->d_open)(dev, ap->a_mode, S_IFBLK, p));
+ return ((*bdevsw(maj)->d_open)(dev, ap->a_mode, S_IFBLK, p));
/* NOT REACHED */
default:
break;
@@ -295,7 +295,7 @@ spec_read(ap)
bsize = vp->v_specinfo->si_bsize_best;
- if ((ioctl = bdevsw[major(dev)]->d_ioctl) != NULL &&
+ if ((ioctl = bdevsw(major(dev))->d_ioctl) != NULL &&
(*ioctl)(dev, DIOCGPART, (caddr_t)&dpart, FREAD, p) == 0 &&
dpart.part->p_fstype == FS_BSDFFS &&
dpart.part->p_frag != 0 && dpart.part->p_fsize != 0)
@@ -379,7 +379,7 @@ spec_write(ap)
*/
bsize = vp->v_specinfo->si_bsize_best;
- if ((*bdevsw[major(vp->v_rdev)]->d_ioctl)(vp->v_rdev, DIOCGPART,
+ if ((*bdevsw(major(vp->v_rdev))->d_ioctl)(vp->v_rdev, DIOCGPART,
(caddr_t)&dpart, FREAD, p) == 0) {
if (dpart.part->p_fstype == FS_BSDFFS &&
dpart.part->p_frag != 0 && dpart.part->p_fsize != 0)
@@ -437,7 +437,7 @@ spec_ioctl(ap)
return ((*cdevsw[major(dev)]->d_ioctl)(dev, ap->a_command,
ap->a_data, ap->a_fflag, ap->a_p));
case VBLK:
- return ((*bdevsw[major(dev)]->d_ioctl)(dev, ap->a_command,
+ return ((*bdevsw(major(dev))->d_ioctl)(dev, ap->a_command,
ap->a_data, ap->a_fflag, ap->a_p));
default:
panic("spec_ioctl");
@@ -553,7 +553,7 @@ spec_strategy(ap)
if (((bp->b_flags & B_READ) == 0) &&
(LIST_FIRST(&bp->b_dep)) != NULL && bioops.io_start)
(*bioops.io_start)(bp);
- (*bdevsw[major(bp->b_dev)]->d_strategy)(bp);
+ (*bdevsw(major(bp->b_dev))->d_strategy)(bp);
return (0);
}
@@ -568,7 +568,7 @@ spec_freeblks(ap)
struct cdevsw *bsw;
struct buf *bp;
- bsw = bdevsw[major(ap->a_vp->v_rdev)];
+ bsw = bdevsw(major(ap->a_vp->v_rdev));
if ((bsw->d_flags & D_CANFREE) == 0)
return (0);
bp = geteblk(ap->a_length);
@@ -678,7 +678,7 @@ spec_close(ap)
if ((vcount(vp) > 1) && (vp->v_flag & VXLOCK) == 0)
return (0);
- devclose = bdevsw[major(dev)]->d_close;
+ devclose = bdevsw(major(dev))->d_close;
mode = S_IFBLK;
break;
@@ -956,7 +956,7 @@ spec_getattr(ap)
vap->va_blocksize = MAXBSIZE;
}
- if ((*bdevsw[major(vp->v_rdev)]->d_ioctl)(vp->v_rdev, DIOCGPART,
+ if ((*bdevsw(major(vp->v_rdev))->d_ioctl)(vp->v_rdev, DIOCGPART,
(caddr_t)&dpart, FREAD, ap->a_p) == 0) {
vap->va_bytes = dbtob(dpart.disklab->d_partitions
[minor(vp->v_rdev)].p_size);
OpenPOWER on IntegriCloud