From 6a5dc97620c08ad609e1b3c3c042f150feb46dd3 Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 31 May 1999 11:29:30 +0000 Subject: Simplify cdevsw registration. The cdevsw_add() function now finds the major number(s) in the struct cdevsw passed to it. cdevsw_add_generic() is no longer needed, cdevsw_add() does the same thing. cdevsw_add() will print an message if the d_maj field looks bogus. Remove nblkdev and nchrdev variables. Most places they were used bogusly. Instead check a dev_t for validity by seeing if devsw() or bdevsw() returns NULL. Move bdevsw() and devsw() functions to kern/kern_conf.c Bump __FreeBSD_version to 400006 This commit removes: 72 bogus makedev() calls 26 bogus SYSINIT functions if_xe.c bogusly accessed cdevsw[], author/maintainer please fix. I4b and vinum not changed. Patches emailed to authors. LINT probably broken until they catch up. --- sys/miscfs/kernfs/kernfs_vfsops.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'sys/miscfs/kernfs/kernfs_vfsops.c') diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c index 7ae0a35..a945fae 100644 --- a/sys/miscfs/kernfs/kernfs_vfsops.c +++ b/sys/miscfs/kernfs/kernfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95 - * $Id: kernfs_vfsops.c,v 1.26 1999/05/08 06:39:52 phk Exp $ + * $Id: kernfs_vfsops.c,v 1.27 1999/05/11 19:54:36 phk Exp $ */ /* @@ -80,6 +80,7 @@ kernfs_get_rrootdev() { static int tried = 0; int cmaj; + struct cdevsw *sw; if (tried) { /* Already did it once. */ @@ -87,18 +88,12 @@ kernfs_get_rrootdev() } tried = 1; - if (!bdevsw(rootdev)) { - panic("root dev has no bdevsw"); - } + sw = bdevsw(rootdev); + if (!sw) + return; if (rootdev == NODEV) return; - for (cmaj = 0; cmaj < nchrdev; cmaj++) { - rrootdev = makedev(cmaj, minor(rootdev)); - if (chrtoblk(rrootdev) == rootdev) - return; - } - rrootdev = NODEV; - printf("kernfs_get_rrootdev: no raw root device\n"); + rrootdev = makedev(sw->d_maj, minor(rootdev)); } /* -- cgit v1.1