diff options
| author | phk <phk@FreeBSD.org> | 2000-09-02 19:17:34 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2000-09-02 19:17:34 +0000 |
| commit | e47f61e18396b6e5f61ee91b9f9f832976ee96cf (patch) | |
| tree | bc17f23dc3fa3b9663516bac048049a5f02652ea /sys/kern/subr_diskslice.c | |
| parent | 0ab175f21b9e105fcbe4db6569019e946f23e13c (diff) | |
| download | FreeBSD-src-e47f61e18396b6e5f61ee91b9f9f832976ee96cf.zip FreeBSD-src-e47f61e18396b6e5f61ee91b9f9f832976ee96cf.tar.gz | |
Avoid the modules madness I inadvertently introduced by making the
cloning infrastructure standard in kern_conf. Modules are now
the same with or without devfs support.
If you need to detect if devfs is present, in modules or elsewhere,
check the integer variable "devfs_present".
This happily removes an ugly hack from kern/vfs_conf.c.
This forces a rename of the eventhandler and the standard clone
helper function.
Include <sys/eventhandler.h> in <sys/conf.h>: it's a helper #include
like <sys/queue.h>
Remove all #includes of opt_devfs.h they no longer matter.
Diffstat (limited to 'sys/kern/subr_diskslice.c')
| -rw-r--r-- | sys/kern/subr_diskslice.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 8d5d4ab..eed211c 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -46,8 +46,6 @@ * $FreeBSD$ */ -#include "opt_devfs.h" - #include <stddef.h> #include <sys/param.h> @@ -465,16 +463,13 @@ dsioctl(dev, cmd, data, flags, sspp) S_IFCHR, ssp->dss_oflags, sspp, lp); if (error != 0) { - /* XXX should free devfs toks. */ free(lp, M_DEVBUF); - /* XXX should restore devfs toks. */ *sspp = ssp; return (EBUSY); } } } - /* XXX devfs tokens? */ free(lp, M_DEVBUF); dsgone(&ssp); return (0); @@ -693,10 +688,7 @@ dsopen(dev, mode, flags, sspp, lp) ssp->dss_slices[WHOLE_DISK_SLICE].ds_wlabel = TRUE; } - /* - * Initialize secondary info for all slices. It is needed for more - * than the current slice in the DEVFS case. - */ + /* Initialize secondary info for all slices. */ for (slice = 0; slice < ssp->dss_nslices; slice++) { sp = &ssp->dss_slices[slice]; if (sp->ds_label != NULL |
