summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-08-13 10:29:38 +0000
committerphk <phk@FreeBSD.org>1999-08-13 10:29:38 +0000
commit7b7ae40370ce27419c2f1c0cda88ea6525a1066d (patch)
tree3305e31c2721a7973c3c9558eef0c23d9ba30704 /sys/fs
parent683c2698ff60010cda4f6821ac884b7beb2f4cbf (diff)
downloadFreeBSD-src-7b7ae40370ce27419c2f1c0cda88ea6525a1066d.zip
FreeBSD-src-7b7ae40370ce27419c2f1c0cda88ea6525a1066d.tar.gz
The bdevsw() and cdevsw() are now identical, so kill the former.
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/ntfs/ntfs_vfsops.c4
-rw-r--r--sys/fs/specfs/spec_vnops.c18
4 files changed, 19 insertions, 19 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index d202bc5..3e9ada1 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.56 1999/05/31 11:27:21 phk Exp $
+ * $Id: cd9660_vfsops.c,v 1.57 1999/08/08 18:42:45 phk Exp $
*/
#include <sys/param.h>
@@ -117,7 +117,7 @@ iso_get_ssector(dev, p)
struct cdevsw *bd;
d_ioctl_t *ioctlp;
- bd = bdevsw(dev);
+ bd = devsw(dev);
ioctlp = bd->d_ioctl;
if (ioctlp == NULL)
return 0;
@@ -188,7 +188,7 @@ cd9660_mount(mp, path, data, ndp, p)
struct iso_mnt *imp = 0;
if ((mp->mnt_flag & MNT_ROOTFS) != 0) {
- if (bdevsw(rootdev)->d_flags & D_NOCLUSTERR)
+ if (devsw(rootdev)->d_flags & D_NOCLUSTERR)
mp->mnt_flag |= MNT_NOCLUSTERR;
return (iso_mountroot(mp, p));
}
@@ -205,7 +205,7 @@ cd9660_mount(mp, path, data, ndp, p)
*/
if (mp->mnt_flag & MNT_UPDATE) {
imp = VFSTOISOFS(mp);
- if (bdevsw(imp->im_devvp->v_rdev)->d_flags &
+ if (devsw(imp->im_devvp->v_rdev)->d_flags &
D_NOCLUSTERR)
mp->mnt_flag |= MNT_NOCLUSTERR;
if (args.fspec == 0)
@@ -224,7 +224,7 @@ cd9660_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;
}
@@ -245,7 +245,7 @@ cd9660_mount(mp, path, data, ndp, p)
VOP_UNLOCK(devvp, 0, 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;
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 da1b507..2729126 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.45 1999/05/31 11:28:02 phk Exp $ */
+/* $Id: msdosfs_vfsops.c,v 1.46 1999/08/08 18:42:54 phk Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
/*-
@@ -297,7 +297,7 @@ msdosfs_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);
}
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index d8ed12b..172460d 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ntfs_vfsops.c,v 1.7 1999/05/31 11:28:30 phk Exp $
+ * $Id: ntfs_vfsops.c,v 1.8 1999/08/08 18:42:58 phk Exp $
*/
@@ -294,7 +294,7 @@ ntfs_mount (
err = ENOTBLK;
goto error_2;
}
- if (bdevsw(devvp->v_rdev) == NULL) {
+ if (devsw(devvp->v_rdev) == NULL) {
err = ENXIO;
goto error_2;
}
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 4f8e853..95a25f4 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.91 1999/08/08 18:42:52 phk Exp $
+ * $Id: spec_vnops.c,v 1.92 1999/08/13 10:10:10 phk Exp $
*/
#include <sys/param.h>
@@ -208,7 +208,7 @@ spec_open(ap)
return (error);
/* NOT REACHED */
case VBLK:
- dsw = bdevsw(dev);
+ dsw = devsw(dev);
if ( (dsw == NULL) || (dsw->d_open == NULL))
return ENXIO;
/*
@@ -290,7 +290,7 @@ spec_read(ap)
bsize = vp->v_rdev->si_bsize_best;
- if ((ioctl = bdevsw(dev)->d_ioctl) != NULL &&
+ if ((ioctl = devsw(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)
@@ -374,7 +374,7 @@ spec_write(ap)
*/
bsize = vp->v_rdev->si_bsize_best;
- if ((*bdevsw(vp->v_rdev)->d_ioctl)(vp->v_rdev, DIOCGPART,
+ if ((*devsw(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)
@@ -432,7 +432,7 @@ spec_ioctl(ap)
return ((*devsw(dev)->d_ioctl)(dev, ap->a_command,
ap->a_data, ap->a_fflag, ap->a_p));
case VBLK:
- return ((*bdevsw(dev)->d_ioctl)(dev, ap->a_command,
+ return ((*devsw(dev)->d_ioctl)(dev, ap->a_command,
ap->a_data, ap->a_fflag, ap->a_p));
default:
panic("spec_ioctl");
@@ -548,7 +548,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(bp->b_dev)->d_strategy)(bp);
+ (*devsw(bp->b_dev)->d_strategy)(bp);
return (0);
}
@@ -563,7 +563,7 @@ spec_freeblks(ap)
struct cdevsw *bsw;
struct buf *bp;
- bsw = bdevsw(ap->a_vp->v_rdev);
+ bsw = devsw(ap->a_vp->v_rdev);
if ((bsw->d_flags & D_CANFREE) == 0)
return (0);
bp = geteblk(ap->a_length);
@@ -673,7 +673,7 @@ spec_close(ap)
if ((vcount(vp) > 1) && (vp->v_flag & VXLOCK) == 0)
return (0);
- devclose = bdevsw(dev)->d_close;
+ devclose = devsw(dev)->d_close;
mode = S_IFBLK;
break;
@@ -951,7 +951,7 @@ spec_getattr(ap)
vap->va_blocksize = MAXBSIZE;
}
- if ((*bdevsw(vp->v_rdev)->d_ioctl)(vp->v_rdev, DIOCGPART,
+ if ((*devsw(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