diff options
| author | phk <phk@FreeBSD.org> | 1999-08-13 10:29:38 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-08-13 10:29:38 +0000 |
| commit | 7b7ae40370ce27419c2f1c0cda88ea6525a1066d (patch) | |
| tree | 3305e31c2721a7973c3c9558eef0c23d9ba30704 /sys/ufs | |
| parent | 683c2698ff60010cda4f6821ac884b7beb2f4cbf (diff) | |
| download | FreeBSD-src-7b7ae40370ce27419c2f1c0cda88ea6525a1066d.zip FreeBSD-src-7b7ae40370ce27419c2f1c0cda88ea6525a1066d.tar.gz | |
The bdevsw() and cdevsw() are now identical, so kill the former.
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 16 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_bmap.c | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 885d1e9..0f249e4 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 - * $Id: ffs_vfsops.c,v 1.100 1999/07/11 19:16:50 phk Exp $ + * $Id: ffs_vfsops.c,v 1.101 1999/08/08 18:43:01 phk Exp $ */ #include "opt_quota.h" @@ -156,9 +156,9 @@ ffs_mount( mp, path, data, ndp, p) return (err); } - if (bdevsw(rootdev)->d_flags & D_NOCLUSTERR) + if (devsw(rootdev)->d_flags & D_NOCLUSTERR) mp->mnt_flag |= MNT_NOCLUSTERR; - if (bdevsw(rootdev)->d_flags & D_NOCLUSTERW) + if (devsw(rootdev)->d_flags & D_NOCLUSTERW) mp->mnt_flag |= MNT_NOCLUSTERW; if( ( err = ffs_mountfs(rootvp, mp, p, M_FFSNODE)) != 0) { /* fs specific cleanup (if any)*/ @@ -192,9 +192,9 @@ ffs_mount( mp, path, data, ndp, p) devvp = ump->um_devvp; err = 0; ronly = fs->fs_ronly; /* MNT_RELOAD might change this */ - if (bdevsw(ump->um_dev)->d_flags & D_NOCLUSTERR) + if (devsw(ump->um_dev)->d_flags & D_NOCLUSTERR) mp->mnt_flag |= MNT_NOCLUSTERR; - if (bdevsw(ump->um_dev)->d_flags & D_NOCLUSTERW) + if (devsw(ump->um_dev)->d_flags & D_NOCLUSTERW) mp->mnt_flag |= MNT_NOCLUSTERW; if (ronly == 0 && (mp->mnt_flag & MNT_RDONLY)) { flags = WRITECLOSE; @@ -288,7 +288,7 @@ ffs_mount( mp, path, data, ndp, p) err = ENOTBLK; goto error_2; } - if (bdevsw(devvp->v_rdev) == NULL) { + if (devsw(devvp->v_rdev) == NULL) { err = ENXIO; goto error_2; } @@ -344,9 +344,9 @@ ffs_mount( mp, path, data, ndp, p) ******************** */ - if (bdevsw(devvp->v_rdev)->d_flags & D_NOCLUSTERR) + if (devsw(devvp->v_rdev)->d_flags & D_NOCLUSTERR) mp->mnt_flag |= MNT_NOCLUSTERR; - if (bdevsw(devvp->v_rdev)->d_flags & D_NOCLUSTERW) + if (devsw(devvp->v_rdev)->d_flags & D_NOCLUSTERW) mp->mnt_flag |= MNT_NOCLUSTERW; /* diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 7f1e5a3..9a477c5 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 - * $Id: ufs_bmap.c,v 1.28 1999/05/08 06:40:25 phk Exp $ + * $Id: ufs_bmap.c,v 1.29 1999/08/08 18:43:03 phk Exp $ */ #include <sys/param.h> @@ -150,12 +150,12 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp, runb) if (devvp != NULL && devvp->v_tag != VT_MFS && devvp->v_type == VBLK) { - if (bdevsw(devvp->v_rdev)->d_maxio > MAXPHYS) { + if (devsw(devvp->v_rdev)->d_maxio > MAXPHYS) { maxrun = MAXPHYS; vp->v_maxio = MAXPHYS; } else { - maxrun = bdevsw(devvp->v_rdev)->d_maxio; - vp->v_maxio = bdevsw(devvp->v_rdev)->d_maxio; + maxrun = devsw(devvp->v_rdev)->d_maxio; + vp->v_maxio = devsw(devvp->v_rdev)->d_maxio; } maxrun = maxrun / blksize; maxrun -= 1; |
