Convert DEVFS from an "opt-in" to an "opt-out" option.

If for some reason DEVFS is undesired, the "NODEVFS" option is
needed now.

Pending any significant issues, DEVFS will be made mandatory in
-current on july 1st so that we can start reaping the full
benefits of having it.
This commit is contained in:
Poul-Henning Kamp 2001-05-13 20:52:40 +00:00
parent ffb82a6f2b
commit ab9f3b292e
14 changed files with 14 additions and 18 deletions

View File

@ -58,7 +58,6 @@ options NFS #Network Filesystem
options NFS_ROOT #NFS usable as root device
options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
options DEVFS #Device Filesystem
options PROCFS #Process filesystem
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI

View File

@ -58,7 +58,6 @@ options NFS #Network Filesystem
options NFS_ROOT #NFS usable as root device
options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
options DEVFS #Device Filesystem
options PROCFS #Process filesystem
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI

View File

@ -40,7 +40,6 @@ options NFS #Network Filesystem
options NFS_ROOT #NFS usable as root device, NFS required
options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
options DEVFS #Device Filesystem
options PROCFS #Process filesystem
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI

View File

@ -672,7 +672,7 @@ options PORTAL #Portal filesystem
options PROCFS #Process filesystem
options UMAPFS #UID map filesystem
options UNION #Union filesystem
options DEVFS #devices filesystem
# options NODEVFS #disable devices filesystem
# The xFS_ROOT options REQUIRE the associated ``options xFS''
options NFS_ROOT #NFS usable as root device
# This code enables IFS, an FFS which exports inodes as the namespace.

View File

@ -585,9 +585,9 @@ dev/wds/wd7000.c optional wds isa
dev/wi/if_wi.c optional wi card
dev/wi/if_wi.c optional wi pccard
dev/xe/if_xe.c optional xe card
fs/devfs/devfs_vnops.c optional devfs
fs/devfs/devfs_vfsops.c optional devfs
fs/devfs/devfs_devs.c optional devfs
fs/devfs/devfs_vnops.c standard
fs/devfs/devfs_vfsops.c standard
fs/devfs/devfs_devs.c standard
fs/hpfs/hpfs_vfsops.c optional hpfs
fs/hpfs/hpfs_vnops.c optional hpfs
fs/hpfs/hpfs_hash.c optional hpfs

View File

@ -62,7 +62,7 @@ CY_PCI_FASTINTR
DDB
DDB_UNATTENDED opt_ddb.h
GDB_REMOTE_CHAT opt_ddb.h
DEVFS
NODEVFS opt_devfs.h
HW_WDOG
KTRACE
LIBICONV

View File

@ -30,6 +30,7 @@
*/
#include "opt_devfs.h"
#ifndef NODEVFS
#include <sys/param.h>
#include <sys/systm.h>
@ -431,3 +432,4 @@ devfs_destroy(dev_t dev)
devfs_create_t *devfs_create_hook = devfs_create;
devfs_destroy_t *devfs_destroy_hook = devfs_destroy;
int devfs_present = 1;
#endif

View File

@ -35,6 +35,7 @@
*/
#include "opt_devfs.h"
#ifndef NODEVFS
#include <sys/param.h>
#include <sys/systm.h>
@ -207,3 +208,4 @@ static struct vfsops devfs_vfsops = {
};
VFS_SET(devfs_vfsops, devfs, VFCF_SYNTHETIC);
#endif

View File

@ -1,4 +1,3 @@
#define DEBUG 1
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@ -35,6 +34,9 @@
* $FreeBSD$
*/
#include <opt_devfs.h>
#ifndef NODEVFS
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
@ -193,10 +195,6 @@ devfs_getattr(ap)
vap->va_nlink = de->de_links;
vap->va_fileid = de->de_inode;
#ifdef DEBUG
if (error)
printf("devfs_getattr: return error %d\n", error);
#endif
return (error);
}
@ -711,3 +709,4 @@ static struct vnodeopv_desc devfs_specop_opv_desc =
{ &devfs_specop_p, devfs_specop_entries };
VNODEOP_SET(devfs_specop_opv_desc);
#endif

View File

@ -40,7 +40,6 @@ options NFS #Network Filesystem
options NFS_ROOT #NFS usable as root device, NFS required
options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
options DEVFS #Device Filesystem
options PROCFS #Process filesystem
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI

View File

@ -44,7 +44,6 @@ options NFS #Network Filesystem
options NFS_ROOT #NFS usable as root device, NFS required
options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
options DEVFS #Device Filesystem
options PROCFS #Process filesystem
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI

View File

@ -672,7 +672,7 @@ options PORTAL #Portal filesystem
options PROCFS #Process filesystem
options UMAPFS #UID map filesystem
options UNION #Union filesystem
options DEVFS #devices filesystem
# options NODEVFS #disable devices filesystem
# The xFS_ROOT options REQUIRE the associated ``options xFS''
options NFS_ROOT #NFS usable as root device
# This code enables IFS, an FFS which exports inodes as the namespace.

View File

@ -36,7 +36,6 @@ options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem
options SOFTUPDATES #Enable FFS soft updates support
options MFS #Memory Filesystem
#options DEVFS #Device Filesystem
options MD_ROOT #MD is a potential root device
options NFS #Network Filesystem
options NFS_ROOT #NFS usable as root device

View File

@ -42,7 +42,6 @@ options NFS #Network Filesystem
options NFS_ROOT #NFS usable as root device, NFS required
options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
#options DEVFS #Device Filesystem
options PROCFS #Process filesystem
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI