diff options
author | phk <phk@FreeBSD.org> | 1999-05-31 11:29:30 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-05-31 11:29:30 +0000 |
commit | 6a5dc97620c08ad609e1b3c3c042f150feb46dd3 (patch) | |
tree | 6cfc9338ae83f67fd38a853cd0782713c73cad13 /sys/coda | |
parent | 881e2636833297a207a791fabd8befc818b1b3fb (diff) | |
download | FreeBSD-src-6a5dc97620c08ad609e1b3c3c042f150feb46dd3.zip FreeBSD-src-6a5dc97620c08ad609e1b3c3c042f150feb46dd3.tar.gz |
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.
Diffstat (limited to 'sys/coda')
-rw-r--r-- | sys/coda/coda_fbsd.c | 8 | ||||
-rw-r--r-- | sys/coda/coda_vfsops.c | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c index 49bba22..9c349f8 100644 --- a/sys/coda/coda_fbsd.c +++ b/sys/coda/coda_fbsd.c @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_fbsd.c,v 1.13 1999/01/28 00:57:46 dillon Exp $ + * $Id: coda_fbsd.c,v 1.14 1999/05/30 16:51:10 phk Exp $ * */ @@ -101,7 +101,6 @@ int vcdebug = 1; static int codadev_modevent(module_t mod, int type, void *data) { - dev_t dev; #ifdef DEVFS int i; #endif @@ -109,8 +108,7 @@ codadev_modevent(module_t mod, int type, void *data) switch (type) { case MOD_LOAD: - dev = makedev(VC_DEV_NO, 0); - cdevsw_add(&dev,&codadevsw, &oldcdevsw); + cdevsw_add(&codadevsw); #ifdef DEVFS /* tmp */ #undef NVCODA @@ -134,7 +132,7 @@ codadev_modevent(module_t mod, int type, void *data) devfs_remove_dev(coda_devfs_token[i]); } #endif - cdevsw_add(&dev, oldcdevsw, NULL); + cdevsw_add(oldcdevsw); break; default: break; diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c index dfb4e0e..50245d0 100644 --- a/sys/coda/coda_vfsops.c +++ b/sys/coda/coda_vfsops.c @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_vfsops.c,v 1.12 1999/05/08 06:39:04 phk Exp $ + * $Id: coda_vfsops.c,v 1.13 1999/05/09 13:11:37 phk Exp $ * */ @@ -47,6 +47,9 @@ /* * HISTORY * $Log: coda_vfsops.c,v $ + * Revision 1.13 1999/05/09 13:11:37 phk + * remove cast from dev_t to dev_t. + * * Revision 1.12 1999/05/08 06:39:04 phk * I got tired of seeing all the cdevsw[major(foo)] all over the place. * @@ -341,10 +344,6 @@ coda_mount(vfsp, path, data, ndp, p) } dev = dvp->v_specinfo->si_rdev; vrele(dvp); - if (major(dev) >= nchrdev || major(dev) < 0) { - MARK_INT_FAIL(CODA_MOUNT_STATS); - return(ENXIO); - } /* * See if the device table matches our expectations. |