diff options
author | phk <phk@FreeBSD.org> | 2002-10-05 16:35:33 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-10-05 16:35:33 +0000 |
commit | 951c3e53b2ed3b6d204d571d81928a44baf1a85e (patch) | |
tree | 281a4e3831a5ca364a19928efbfe097201919121 /sys/geom/geom_disk.c | |
parent | ca4946005d763c5181649378e37809110aa0e1b5 (diff) | |
download | FreeBSD-src-951c3e53b2ed3b6d204d571d81928a44baf1a85e.zip FreeBSD-src-951c3e53b2ed3b6d204d571d81928a44baf1a85e.tar.gz |
NB: This commit does *NOT* make GEOM the default in FreeBSD
NB: But it will enable it in all kernels not having options "NO_GEOM"
Put the GEOM related options into the intended order.
Add "options NO_GEOM" to all kernel configs apart from NOTES.
In some order of controlled fashion, the NO_GEOM options will be
removed, architecture by architecture in the coming days.
There are currently three known issues which may force people to
need the NO_GEOM option:
boot0cfg/fdisk:
Tries to update the MBR while it is being used to control
slices. GEOM does not allow this as a direct operation.
SCSI floppy drives:
Appearantly the scsi-da driver return "EBUSY" if no media
is inserted. This is wrong, it should return ENXIO.
PC98:
It is unclear if GEOM correctly recognizes all variants of
PC98 disklabels. (Help Wanted! I have neither docs nor HW)
These issues are all being worked.
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/geom/geom_disk.c')
-rw-r--r-- | sys/geom/geom_disk.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c index 2353924..212e073 100644 --- a/sys/geom/geom_disk.c +++ b/sys/geom/geom_disk.c @@ -35,6 +35,9 @@ * $FreeBSD$ */ +#include "opt_geom.h" +#ifndef NO_GEOM + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -263,15 +266,6 @@ disk_invalidate (struct disk *disk) { } -SYSCTL_INT(_debug_sizeof, OID_AUTO, disklabel, CTLFLAG_RD, - 0, sizeof(struct disklabel), "sizeof(struct disklabel)"); - -SYSCTL_INT(_debug_sizeof, OID_AUTO, diskslices, CTLFLAG_RD, - 0, sizeof(struct diskslices), "sizeof(struct diskslices)"); - -SYSCTL_INT(_debug_sizeof, OID_AUTO, disk, CTLFLAG_RD, - 0, sizeof(struct disk), "sizeof(struct disk)"); - static void g_kern_disks(void *p) { @@ -309,3 +303,5 @@ sysctl_disks(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_kern, OID_AUTO, disks, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NOLOCK, 0, 0, sysctl_disks, "A", "names of available disks"); + +#endif |