diff options
| -rw-r--r-- | sys/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/conf/options | 4 | ||||
| -rw-r--r-- | sys/fs/devfs/devfs_devs.c | 1 | ||||
| -rw-r--r-- | sys/fs/devfs/devfs_rule.c | 2 | ||||
| -rw-r--r-- | sys/fs/devfs/devfs_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 13 | ||||
| -rw-r--r-- | sys/kern/kern_mac.c | 1 | ||||
| -rw-r--r-- | sys/security/mac/mac_framework.c | 1 | ||||
| -rw-r--r-- | sys/security/mac/mac_syscalls.c | 1 | ||||
| -rw-r--r-- | sys/security/mac/mac_vfs.c | 1 |
10 files changed, 0 insertions, 28 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 940939807086..2a1fe5e3bc85 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2625,8 +2625,6 @@ options AAC_DEBUG # Debugging levels: ##options BKTR_ALLOC_PAGES=(217*4+1) options BROOKTREE_ALLOC_PAGES=(217*4+1) options MAXFILES=999 -options NDEVFSINO=1025 -options NDEVFSOVERFLOW=32769 # Yet more undocumented options for linting. options VGA_DEBUG diff --git a/sys/conf/options b/sys/conf/options index ea044fc63a2d..d2313fe45063 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -621,10 +621,6 @@ ACPICA_PEDANTIC opt_acpi.h DEV_ISA opt_isa.h ISAPNP opt_isa.h -# options for DEVFS, see sys/fs/devfs/devfs.h -NDEVFSINO opt_devfs.h -NDEVFSOVERFLOW opt_devfs.h - # various 'device presence' options. DEV_BPF opt_bpf.h DEV_MCA opt_mca.h diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index e1c82e8b1967..d933f9f19fba 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -28,7 +28,6 @@ * $FreeBSD$ */ -#include "opt_devfs.h" #include "opt_mac.h" #include <sys/param.h> diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c index bfd23b7ec22e..a0caad9cfb8b 100644 --- a/sys/fs/devfs/devfs_rule.c +++ b/sys/fs/devfs/devfs_rule.c @@ -62,8 +62,6 @@ * know the convention). */ -#include "opt_devfs.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index ecca6296bccb..17db07a7b5ee 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -34,8 +34,6 @@ * $FreeBSD$ */ -#include "opt_devfs.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index fda617d7eb18..9d2ca1ea46f9 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -40,7 +40,6 @@ * mkdir: want it ? */ -#include "opt_devfs.h" #include "opt_mac.h" #include <sys/param.h> @@ -648,18 +647,6 @@ devfs_open(struct vop_open_args *ap) if (dev->si_iosize_max == 0) dev->si_iosize_max = DFLTPHYS; - if (vn_isdisk(vp, NULL) && - ap->a_cred != FSCRED && (ap->a_mode & FWRITE)) { - /* - * When running in very secure mode, do not allow - * opens for writing of any disks. - * XXX: should be in geom_dev.c, but we lack the cred there. - */ - error = securelevel_ge(td->td_ucred, 2); - if (error) - return (error); - } - dsw = dev_refthread(dev); if (dsw == NULL) return (ENXIO); diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index 19e6d7df7f65..fbb5ebc0a742 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include "opt_mac.h" -#include "opt_devfs.h" #include <sys/param.h> #include <sys/condvar.h> diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index 19e6d7df7f65..fbb5ebc0a742 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include "opt_mac.h" -#include "opt_devfs.h" #include <sys/param.h> #include <sys/condvar.h> diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 19e6d7df7f65..fbb5ebc0a742 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include "opt_mac.h" -#include "opt_devfs.h" #include <sys/param.h> #include <sys/condvar.h> diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index c9ed9ccaf370..ee77901eca0f 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include "opt_mac.h" -#include "opt_devfs.h" #include <sys/param.h> #include <sys/condvar.h> |