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/gnu/ext2fs | |
| 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/gnu/ext2fs')
| -rw-r--r-- | sys/gnu/ext2fs/ext2_bmap.c | 8 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/ext2_vfsops.c | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c index 3ea5965..88f4c24 100644 --- a/sys/gnu/ext2fs/ext2_bmap.c +++ b/sys/gnu/ext2fs/ext2_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 - * $Id: ufs_bmap.c,v 1.25 1999/01/28 00:57:55 dillon Exp $ + * $Id: ufs_bmap.c,v 1.26 1999/05/02 23:57:04 alc Exp $ */ #include <sys/param.h> @@ -151,12 +151,12 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp, runb) if (devvp != NULL && devvp->v_tag != VT_MFS && devvp->v_type == VBLK) { - if (bdevsw[major(devvp->v_rdev)]->d_maxio > MAXPHYS) { + if (bdevsw(major(devvp->v_rdev))->d_maxio > MAXPHYS) { maxrun = MAXPHYS; vp->v_maxio = MAXPHYS; } else { - maxrun = bdevsw[major(devvp->v_rdev)]->d_maxio; - vp->v_maxio = bdevsw[major(devvp->v_rdev)]->d_maxio; + maxrun = bdevsw(major(devvp->v_rdev))->d_maxio; + vp->v_maxio = bdevsw(major(devvp->v_rdev))->d_maxio; } maxrun = maxrun / blksize; maxrun -= 1; diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index 7a1ae24..4410199 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -136,9 +136,9 @@ ext2_mountroot() bzero((char *)mp, (u_long)sizeof(struct mount)); mp->mnt_op = &ext2fs_vfsops; mp->mnt_flag = MNT_RDONLY; - if (bdevsw[major(rootdev)]->d_flags & D_NOCLUSTERR) + if (bdevsw(major(rootdev))->d_flags & D_NOCLUSTERR) mp->mnt_flag |= MNT_NOCLUSTERR; - if (bdevsw[major(rootdev)]->d_flags & D_NOCLUSTERW) + if (bdevsw(major(rootdev))->d_flags & D_NOCLUSTERW) mp->mnt_flag |= MNT_NOCLUSTERW; if (error = ext2_mountfs(rootvp, mp, p)) { bsd_free(mp, M_MOUNT); @@ -201,9 +201,9 @@ ext2_mount(mp, path, data, ndp, p) ump = VFSTOUFS(mp); fs = ump->um_e2fs; error = 0; - if (bdevsw[major(ump->um_dev)]->d_flags & D_NOCLUSTERR) + if (bdevsw(major(ump->um_dev))->d_flags & D_NOCLUSTERR) mp->mnt_flag |= MNT_NOCLUSTERR; - if (bdevsw[major(ump->um_dev)]->d_flags & D_NOCLUSTERW) + if (bdevsw(major(ump->um_dev))->d_flags & D_NOCLUSTERW) mp->mnt_flag |= MNT_NOCLUSTERW; if (fs->s_rd_only == 0 && (mp->mnt_flag & MNT_RDONLY)) { flags = WRITECLOSE; @@ -277,7 +277,7 @@ ext2_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); } @@ -299,9 +299,9 @@ ext2_mount(mp, path, data, ndp, 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; - if (bdevsw[major(devvp->v_rdev)]->d_flags & D_NOCLUSTERW) + if (bdevsw(major(devvp->v_rdev))->d_flags & D_NOCLUSTERW) mp->mnt_flag |= MNT_NOCLUSTERW; error = ext2_mountfs(devvp, mp, p); } else { |
