The bdevsw() and cdevsw() are now identical, so kill the former.

4 files changed, 22 insertions, 22 deletions

diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index 7f1e5a3..9a477c5 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.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;
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index 32df655..ffbabd1 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -134,9 +134,9 @@ ext2_mountroot()
 	bzero((char *)mp, (u_long)sizeof(struct mount));
 	mp->mnt_op = &ext2fs_vfsops;
 	mp->mnt_flag = MNT_RDONLY;
-	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 (error = ext2_mountfs(rootvp, mp, p)) {
 		bsd_free(mp, M_MOUNT);
@@ -199,9 +199,9 @@ ext2_mount(mp, path, data, ndp, p)
 		ump = VFSTOUFS(mp);
 		fs = ump->um_e2fs;
 		error = 0;
-		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 (fs->s_rd_only == 0 && (mp->mnt_flag & MNT_RDONLY)) {
 			flags = WRITECLOSE;
@@ -274,7 +274,7 @@ ext2_mount(mp, path, data, ndp, p)
 		vrele(devvp);
 		return (ENOTBLK);
 	}
-	if (bdevsw(devvp->v_rdev) == NULL) {
+	if (devsw(devvp->v_rdev) == NULL) {
 		vrele(devvp);
 		return (ENXIO);
 	}
@@ -296,9 +296,9 @@ ext2_mount(mp, path, data, ndp, p)
 	}
 
 	if ((mp->mnt_flag & MNT_UPDATE) == 0) {
-		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;
 		error = ext2_mountfs(devvp, mp, p);
 	} else {
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 7f1e5a3..9a477c5 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/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.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;
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index 32df655..ffbabd1 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -134,9 +134,9 @@ ext2_mountroot()
 	bzero((char *)mp, (u_long)sizeof(struct mount));
 	mp->mnt_op = &ext2fs_vfsops;
 	mp->mnt_flag = MNT_RDONLY;
-	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 (error = ext2_mountfs(rootvp, mp, p)) {
 		bsd_free(mp, M_MOUNT);
@@ -199,9 +199,9 @@ ext2_mount(mp, path, data, ndp, p)
 		ump = VFSTOUFS(mp);
 		fs = ump->um_e2fs;
 		error = 0;
-		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 (fs->s_rd_only == 0 && (mp->mnt_flag & MNT_RDONLY)) {
 			flags = WRITECLOSE;
@@ -274,7 +274,7 @@ ext2_mount(mp, path, data, ndp, p)
 		vrele(devvp);
 		return (ENOTBLK);
 	}
-	if (bdevsw(devvp->v_rdev) == NULL) {
+	if (devsw(devvp->v_rdev) == NULL) {
 		vrele(devvp);
 		return (ENXIO);
 	}
@@ -296,9 +296,9 @@ ext2_mount(mp, path, data, ndp, p)
 	}
 
 	if ((mp->mnt_flag & MNT_UPDATE) == 0) {
-		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;
 		error = ext2_mountfs(devvp, mp, p);
 	} else {