upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Poul-Henning Kamp 1999-08-13 10:29:38 +00:00
parent 4d4f932326
commit 7dc5cd047f
27 changed files with 120 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sys/amd64/amd64/autoconf.c
View file

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.130 1999/08/06 20:29:46 phk Exp $
* $Id: autoconf.c,v 1.131 1999/08/09 10:34:40 phk Exp $
*/
/*
@ -158,7 +158,7 @@ find_cdrom_root()
if (try_cdrom[j].major >= NUMCDEVSW)
continue;
rootdev = makebdev(try_cdrom[j].major, i * 8);
bd = bdevsw(rootdev);
bd = devsw(rootdev);
if (bd == NULL || bd->d_open == NULL)
continue;
if (bootverbose)
@ -396,7 +396,7 @@ setroot()
}
majdev = B_TYPE(bootdev);
dev = makebdev(majdev, 0);
if (bdevsw(dev) == NULL) {
if (devsw(dev) == NULL) {
printf("No bdevsw (majdev=%d bootdev=%p)\n", majdev,
(void *)bootdev);
setconf();
@ -427,7 +427,7 @@ setroot()
newrootdev = makebdev(majdev, mindev);
rootdevs[0] = newrootdev;
sname = dsname(bdevsw(newrootdev)->d_name, unit, slice, part, partname);
sname = dsname(devsw(newrootdev)->d_name, unit, slice, part, partname);
rootdevnames[0] = malloc(strlen(sname) + 2, M_DEVBUF, M_NOWAIT);
sprintf(rootdevnames[0], "%s%s", sname, partname);
@ -444,7 +444,7 @@ setroot()
return;
slice = COMPATIBILITY_SLICE;
rootdevs[1] = dkmodslice(newrootdev, slice);
sname = dsname(bdevsw(newrootdev)->d_name, unit, slice, part, partname);
sname = dsname(devsw(newrootdev)->d_name, unit, slice, part, partname);
rootdevnames[1] = malloc(strlen(sname) + 2, M_DEVBUF, M_NOWAIT);
sprintf(rootdevnames[1], "%s%s", sname, partname);
}
@ -477,8 +477,8 @@ setrootbyname(char *name)
*cp++ = '\0';
for (bd = 0; bd < NUMCDEVSW; bd++) {
dev = makebdev(bd, 0);
if (bdevsw(dev) != NULL &&
strcmp(bdevsw(dev)->d_name, name) == 0)
if (devsw(dev) != NULL &&
strcmp(devsw(dev)->d_name, name) == 0)
goto gotit;
}
return (2);
@ -520,8 +520,8 @@ setconf()
printf("use one of:\n");
for (i = 0; i < NUMCDEVSW; i++) {
dev = makebdev(i, 0);
if (bdevsw(dev) != NULL)
printf(" \"%s\"", bdevsw(dev)->d_name);
if (devsw(dev) != NULL)
printf(" \"%s\"", devsw(dev)->d_name);
}
printf("\nfollowed by a unit number...\n");
}

6
sys/dev/vinum/vinuminterrupt.c
View file

@ -39,7 +39,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
* $Id: vinuminterrupt.c,v 1.12 1999/08/07 08:06:30 grog Exp $
* $Id: vinuminterrupt.c,v 1.13 1999/08/08 18:42:39 phk Exp $
*/
#include <dev/vinum/vinumhdr.h>
@ -390,7 +390,7 @@ complete_raid5_write(struct rqelement *rqe)
if (debug & DEBUG_LASTREQS)
logrq(loginfo_raid5_data, (union rqinfou) rqe, bp);
#endif
(*bdevsw(rqe->b.b_dev)->d_strategy) (&rqe->b);
(*devsw(rqe->b.b_dev)->d_strategy) (&rqe->b);
}
}
}
@ -426,5 +426,5 @@ complete_raid5_write(struct rqelement *rqe)
if (debug & DEBUG_LASTREQS)
logrq(loginfo_raid5_parity, (union rqinfou) rqe, bp);
#endif
(*bdevsw(rqe->b.b_dev)->d_strategy) (&rqe->b);
(*devsw(rqe->b.b_dev)->d_strategy) (&rqe->b);
}

4
sys/dev/vinum/vinumio.c
View file

@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
* $Id: vinumio.c,v 1.34 1999/08/08 14:11:03 bde Exp $
* $Id: vinumio.c,v 1.35 1999/08/08 18:42:40 phk Exp $
*/
#include <dev/vinum/vinumhdr.h>
@ -276,7 +276,7 @@ driveio(struct drive *drive, char *buf, size_t length, off_t offset, int flag)
bp->b_bcount = len;
bp->b_bufsize = len;
(*bdevsw(bp->b_dev)->d_strategy) (bp); /* initiate the transfer */
(*devsw(bp->b_dev)->d_strategy) (bp); /* initiate the transfer */
error = biowait(bp);
printf("driveio: %s dev %d.%d, block 0x%x, len 0x%lx, error %d\n", /* XXX */

6
sys/dev/vinum/vinumrequest.c
View file

@ -37,7 +37,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
* $Id: vinumrequest.c,v 1.29 1999/08/07 08:13:23 grog Exp $
* $Id: vinumrequest.c,v 1.30 1999/08/08 18:42:41 phk Exp $
*/
#include <dev/vinum/vinumhdr.h>
@ -399,7 +399,7 @@ launch_requests(struct request *rq, int reviveok)
logrq(loginfo_rqe, (union rqinfou) rqe, rq->bp);
#endif
/* fire off the request */
(*bdevsw(rqe->b.b_dev)->d_strategy) (&rqe->b);
(*devsw(rqe->b.b_dev)->d_strategy) (&rqe->b);
}
}
}
@ -947,7 +947,7 @@ sdio(struct buf *bp)
sbp->b.b_vp->v_numoutput);
#endif
s = splbio();
(*bdevsw(sbp->b.b_dev)->d_strategy) (&sbp->b);
(*devsw(sbp->b.b_dev)->d_strategy) (&sbp->b);
splx(s);
}

12
sys/fs/cd9660/cd9660_vfsops.c
View file

@ -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 {

4
sys/fs/msdosfs/msdosfs_vfsops.c
View file

@ -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);
}

4
sys/fs/ntfs/ntfs_vfsops.c
View file

@ -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;
}

18
sys/fs/specfs/spec_vnops.c
View file

@ -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);

8
sys/gnu/ext2fs/ext2_bmap.c
View file

@ -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;

14
sys/gnu/ext2fs/ext2_vfsops.c
View file

@ -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 {

8
sys/gnu/fs/ext2fs/ext2_bmap.c
View file

@ -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;

14
sys/gnu/fs/ext2fs/ext2_vfsops.c
View file

@ -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 {

18
sys/i386/i386/autoconf.c
View file

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.130 1999/08/06 20:29:46 phk Exp $
* $Id: autoconf.c,v 1.131 1999/08/09 10:34:40 phk Exp $
*/
/*
@ -158,7 +158,7 @@ find_cdrom_root()
if (try_cdrom[j].major >= NUMCDEVSW)
continue;
rootdev = makebdev(try_cdrom[j].major, i * 8);
bd = bdevsw(rootdev);
bd = devsw(rootdev);
if (bd == NULL || bd->d_open == NULL)
continue;
if (bootverbose)
@ -396,7 +396,7 @@ setroot()
}
majdev = B_TYPE(bootdev);
dev = makebdev(majdev, 0);
if (bdevsw(dev) == NULL) {
if (devsw(dev) == NULL) {
printf("No bdevsw (majdev=%d bootdev=%p)\n", majdev,
(void *)bootdev);
setconf();
@ -427,7 +427,7 @@ setroot()
newrootdev = makebdev(majdev, mindev);
rootdevs[0] = newrootdev;
sname = dsname(bdevsw(newrootdev)->d_name, unit, slice, part, partname);
sname = dsname(devsw(newrootdev)->d_name, unit, slice, part, partname);
rootdevnames[0] = malloc(strlen(sname) + 2, M_DEVBUF, M_NOWAIT);
sprintf(rootdevnames[0], "%s%s", sname, partname);
@ -444,7 +444,7 @@ setroot()
return;
slice = COMPATIBILITY_SLICE;
rootdevs[1] = dkmodslice(newrootdev, slice);
sname = dsname(bdevsw(newrootdev)->d_name, unit, slice, part, partname);
sname = dsname(devsw(newrootdev)->d_name, unit, slice, part, partname);
rootdevnames[1] = malloc(strlen(sname) + 2, M_DEVBUF, M_NOWAIT);
sprintf(rootdevnames[1], "%s%s", sname, partname);
}
@ -477,8 +477,8 @@ setrootbyname(char *name)
*cp++ = '\0';
for (bd = 0; bd < NUMCDEVSW; bd++) {
dev = makebdev(bd, 0);
if (bdevsw(dev) != NULL &&
strcmp(bdevsw(dev)->d_name, name) == 0)
if (devsw(dev) != NULL &&
strcmp(devsw(dev)->d_name, name) == 0)
goto gotit;
}
return (2);
@ -520,8 +520,8 @@ setconf()
printf("use one of:\n");
for (i = 0; i < NUMCDEVSW; i++) {
dev = makebdev(i, 0);
if (bdevsw(dev) != NULL)
printf(" \"%s\"", bdevsw(dev)->d_name);
if (devsw(dev) != NULL)
printf(" \"%s\"", devsw(dev)->d_name);
}
printf("\nfollowed by a unit number...\n");
}

12
sys/isofs/cd9660/cd9660_vfsops.c
View file

@ -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 {

10
sys/kern/kern_conf.c
View file

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: kern_conf.c,v 1.54 1999/08/08 00:34:00 grog Exp $
* $Id: kern_conf.c,v 1.55 1999/08/08 18:42:47 phk Exp $
*/
#include <sys/param.h>
@ -78,12 +78,8 @@ chrtoblk(dev_t dev)
struct cdevsw *
devsw(dev_t dev)
{
return(cdevsw[major(dev)]);
}
struct cdevsw *
bdevsw(dev_t dev)
{
if (dev->si_devsw)
return (dev->si_devsw);
return(cdevsw[major(dev)]);
}

14
sys/kern/kern_shutdown.c
View file

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94
* $Id: kern_shutdown.c,v 1.58 1999/08/09 10:34:57 phk Exp $
* $Id: kern_shutdown.c,v 1.59 1999/08/11 14:02:20 alfred Exp $
*/
#include "opt_ddb.h"
@ -370,11 +370,11 @@ setdumpdev(dev)
return (0);
}
maj = major(dev);
if (bdevsw(dev) == NULL)
if (devsw(dev) == NULL)
return (ENXIO); /* XXX is this right? */
if (bdevsw(dev)->d_psize == NULL)
if (devsw(dev)->d_psize == NULL)
return (ENXIO); /* XXX should be ENODEV ? */
psize = bdevsw(dev)->d_psize(dev);
psize = devsw(dev)->d_psize(dev);
if (psize == -1)
return (ENXIO); /* XXX should be ENODEV ? */
/*
@ -432,15 +432,15 @@ dumpsys(void)
return;
if (dumpdev == NODEV)
return;
if (!(bdevsw(dumpdev)))
if (!(devsw(dumpdev)))
return;
if (!(bdevsw(dumpdev)->d_dump))
if (!(devsw(dumpdev)->d_dump))
return;
dumpsize = Maxmem;
printf("\ndumping to dev (%d,%d), offset %ld\n",
major(dumpdev), minor(dumpdev), dumplo);
printf("dump ");
error = (*bdevsw(dumpdev)->d_dump)(dumpdev);
error = (*devsw(dumpdev)->d_dump)(dumpdev);
if (error == 0) {
printf("succeeded\n");
return;

4
sys/kern/vfs_export.c
View file

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
* $Id: vfs_subr.c,v 1.215 1999/08/08 18:42:49 phk Exp $
* $Id: vfs_subr.c,v 1.216 1999/08/13 10:10:01 phk Exp $
*/
/*
@ -2629,7 +2629,7 @@ retry:
if ((error = VOP_GETATTR(vp, &vat, cred, p)) != 0)
goto retn;
object = vnode_pager_alloc(vp, vat.va_size, 0, 0);
} else if (bdevsw(vp->v_rdev) != NULL) {
} else if (devsw(vp->v_rdev) != NULL) {
/*
* This simply allocates the biggest object possible
* for a VBLK vnode. This should be fixed, but doesn't

4
sys/kern/vfs_subr.c
View file

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
* $Id: vfs_subr.c,v 1.215 1999/08/08 18:42:49 phk Exp $
* $Id: vfs_subr.c,v 1.216 1999/08/13 10:10:01 phk Exp $
*/
/*
@ -2629,7 +2629,7 @@ retry:
if ((error = VOP_GETATTR(vp, &vat, cred, p)) != 0)
goto retn;
object = vnode_pager_alloc(vp, vat.va_size, 0, 0);
} else if (bdevsw(vp->v_rdev) != NULL) {
} else if (devsw(vp->v_rdev) != NULL) {
/*
* This simply allocates the biggest object possible
* for a VBLK vnode. This should be fixed, but doesn't

4
sys/miscfs/kernfs/kernfs_vfsops.c
View file

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95
* $Id: kernfs_vfsops.c,v 1.27 1999/05/11 19:54:36 phk Exp $
* $Id: kernfs_vfsops.c,v 1.28 1999/05/31 11:27:52 phk Exp $
*/
/*
@ -88,7 +88,7 @@ kernfs_get_rrootdev()
}
tried = 1;
sw = bdevsw(rootdev);
sw = devsw(rootdev);
if (!sw)
return;
if (rootdev == NODEV)

18
sys/miscfs/specfs/spec_vnops.c
View file

@ -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);

4
sys/msdosfs/msdosfs_vfsops.c
View file

@ -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);
}

4
sys/ntfs/ntfs_vfsops.c
View file

@ -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;
}

3
sys/sys/conf.h
View file

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)conf.h 8.5 (Berkeley) 1/9/95
* $Id: conf.h,v 1.69 1999/08/09 18:45:20 jdp Exp $
* $Id: conf.h,v 1.70 1999/08/13 10:10:11 phk Exp $
*/
#ifndef _SYS_CONF_H_
@ -248,7 +248,6 @@ static moduledata_t name##_mod = { \
DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE+cmaj*256+bmaj)
struct cdevsw *bdevsw __P((dev_t dev));
int cdevsw_add __P((struct cdevsw *new));
int cdevsw_remove __P((struct cdevsw *old));
dev_t chrtoblk __P((dev_t dev));

3
sys/sys/linedisc.h
View file

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)conf.h 8.5 (Berkeley) 1/9/95
* $Id: conf.h,v 1.69 1999/08/09 18:45:20 jdp Exp $
* $Id: conf.h,v 1.70 1999/08/13 10:10:11 phk Exp $
*/
#ifndef _SYS_CONF_H_
@ -248,7 +248,6 @@ static moduledata_t name##_mod = { \
DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE+cmaj*256+bmaj)
struct cdevsw *bdevsw __P((dev_t dev));
int cdevsw_add __P((struct cdevsw *new));
int cdevsw_remove __P((struct cdevsw *old));
dev_t chrtoblk __P((dev_t dev));

16
sys/ufs/ffs/ffs_vfsops.c
View file

@ -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;
/*

8
sys/ufs/ufs/ufs_bmap.c
View file

@ -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;

8
sys/vm/vm_swap.c
View file

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)vm_swap.c 8.5 (Berkeley) 2/17/94
* $Id: vm_swap.c,v 1.79 1999/07/20 21:29:11 green Exp $
* $Id: vm_swap.c,v 1.80 1999/08/08 18:43:05 phk Exp $
*/
#include "opt_devfs.h"
@ -221,7 +221,7 @@ swapon(p, uap)
switch (vp->v_type) {
case VBLK:
dev = vp->v_rdev;
if (bdevsw(dev) == NULL) {
if (devsw(dev) == NULL) {
error = ENXIO;
break;
}
@ -293,8 +293,8 @@ swaponvp(p, vp, dev, nblks)
if (error)
return (error);
if (nblks == 0 && dev != NODEV && (bdevsw(dev)->d_psize == 0 ||
(nblks = (*bdevsw(dev)->d_psize) (dev)) == -1)) {
if (nblks == 0 && dev != NODEV && (devsw(dev)->d_psize == 0 ||
(nblks = (*devsw(dev)->d_psize) (dev)) == -1)) {
(void) VOP_CLOSE(vp, FREAD | FWRITE, p->p_ucred, p);
return (ENXIO);
}