diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_conf.c | 10 | ||||
| -rw-r--r-- | sys/kern/kern_shutdown.c | 14 | ||||
| -rw-r--r-- | sys/kern/vfs_export.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 4 |
4 files changed, 14 insertions, 18 deletions
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index 0a20262..a3fedc1 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -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)]); } diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index eb16729..8465777 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -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; diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 70be14f..21bb57b 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -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 diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 70be14f..21bb57b 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -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 |
