summaryrefslogtreecommitdiffstats
path: root/sys/fs/cd9660
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/cd9660
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/cd9660')
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c12
1 files changed, 6 insertions, 6 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 {
OpenPOWER on IntegriCloud