From bcf11e8d0048006ba97cb460a134cc23290428b2 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Fri, 5 Jun 2009 14:55:22 +0000 Subject: [PATCH] Move "options MAC" from opt_mac.h to opt_global.h, as it's now in GENERIC and used in a large number of files, but also because an increasing number of incorrect uses of MAC calls were sneaking in due to copy-and-paste of MAC-aware code without the associated opt_mac.h include. Discussed with: pjd --- sys/compat/linux/linux_file.c | 1 - sys/compat/linux/linux_getcwd.c | 1 - sys/compat/linux/linux_misc.c | 1 - sys/compat/linux/linux_stats.c | 1 - sys/compat/svr4/svr4_fcntl.c | 2 -- sys/compat/svr4/svr4_misc.c | 2 -- sys/conf/options | 2 +- sys/contrib/pf/net/pf.c | 1 - sys/fs/devfs/devfs_devs.c | 2 -- sys/fs/devfs/devfs_vfsops.c | 2 -- sys/fs/devfs/devfs_vnops.c | 2 -- sys/fs/nfsserver/nfs_nfsdkrpc.c | 2 ++ sys/fs/unionfs/union_subr.c | 4 +--- sys/i386/i386/sys_machdep.c | 1 - sys/i386/ibcs2/ibcs2_misc.c | 2 -- sys/kern/init_main.c | 1 - sys/kern/kern_acct.c | 2 -- sys/kern/kern_alq.c | 2 -- sys/kern/kern_environment.c | 2 -- sys/kern/kern_exec.c | 1 - sys/kern/kern_exit.c | 1 - sys/kern/kern_fork.c | 1 - sys/kern/kern_jail.c | 1 - sys/kern/kern_ktrace.c | 1 - sys/kern/kern_linker.c | 1 - sys/kern/kern_mbuf.c | 1 - sys/kern/kern_priv.c | 1 - sys/kern/kern_prot.c | 1 - sys/kern/kern_shutdown.c | 1 - sys/kern/kern_sysctl.c | 1 - sys/kern/link_elf.c | 1 - sys/kern/link_elf_obj.c | 1 - sys/kern/subr_trap.c | 1 - sys/kern/sys_pipe.c | 2 -- sys/kern/sys_socket.c | 2 -- sys/kern/sysv_msg.c | 1 - sys/kern/sysv_sem.c | 1 - sys/kern/sysv_shm.c | 1 - sys/kern/uipc_mbuf.c | 1 - sys/kern/uipc_mbuf2.c | 2 -- sys/kern/uipc_sem.c | 1 - sys/kern/uipc_shm.c | 2 -- sys/kern/uipc_socket.c | 1 - sys/kern/uipc_syscalls.c | 1 - sys/kern/uipc_usrreq.c | 1 - sys/kern/vfs_acl.c | 2 -- sys/kern/vfs_extattr.c | 2 -- sys/kern/vfs_lookup.c | 1 - sys/kern/vfs_mount.c | 1 - sys/kern/vfs_subr.c | 1 - sys/kern/vfs_syscalls.c | 1 - sys/kern/vfs_vnops.c | 2 -- sys/net/bpf.c | 1 - sys/net/if.c | 1 - sys/net/if_atmsubr.c | 1 - sys/net/if_ethersubr.c | 1 - sys/net/if_fddisubr.c | 1 - sys/net/if_fwsubr.c | 1 - sys/net/if_gif.c | 1 - sys/net/if_iso88025subr.c | 1 - sys/net/if_loop.c | 1 - sys/net/if_stf.c | 1 - sys/net/if_tun.c | 1 - sys/netatalk/aarp.c | 1 - sys/netatalk/ddp_input.c | 2 -- sys/netatalk/ddp_output.c | 2 -- sys/netinet/if_ether.c | 1 - sys/netinet/igmp.c | 1 - sys/netinet/in_pcb.c | 1 - sys/netinet/ip_divert.c | 1 - sys/netinet/ip_fw2.c | 1 - sys/netinet/ip_icmp.c | 1 - sys/netinet/ip_input.c | 1 - sys/netinet/ip_mroute.c | 1 - sys/netinet/ip_options.c | 1 - sys/netinet/ip_output.c | 1 - sys/netinet/raw_ip.c | 1 - sys/netinet/tcp_input.c | 1 - sys/netinet/tcp_output.c | 1 - sys/netinet/tcp_subr.c | 1 - sys/netinet/tcp_syncache.c | 1 - sys/netinet/tcp_timewait.c | 1 - sys/netinet/udp_usrreq.c | 1 - sys/netinet6/frag6.c | 2 -- sys/netinet6/in6_pcb.c | 1 - sys/netinet6/nd6.c | 1 - sys/netinet6/udp6_usrreq.c | 1 - sys/nfsserver/nfs_srvkrpc.c | 2 ++ sys/nfsserver/nfs_srvsock.c | 2 -- sys/security/audit/audit_syscalls.c | 2 -- sys/ufs/ffs/ffs_vfsops.c | 1 - sys/ufs/ufs/ufs_vnops.c | 1 - sys/vm/swap_pager.c | 1 - sys/vm/vm_mmap.c | 1 - 94 files changed, 6 insertions(+), 115 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 54ab6a251e9f..bb49e3fa8a43 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include #include diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index 6474d1eb152f..afd30c8a4e06 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include #include diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index dc8edf5a54d0..d1e1b3236dfe 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include #include diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 479ccf3c955c..4d21a32a231e 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include #include diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c index a4cdfcf9eee1..88e4fc2bc12d 100644 --- a/sys/compat/svr4/svr4_fcntl.c +++ b/sys/compat/svr4/svr4_fcntl.c @@ -32,8 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index f99431461c60..62bd010bd6df 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -35,8 +35,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/conf/options b/sys/conf/options index 1d9a67bbadb5..c72b3d18a322 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -112,7 +112,7 @@ KSTACK_PAGES KTRACE KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV -MAC +MAC opt_global.h MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h MAC_IFOFF opt_dontuse.h diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c index ca4f79a895e3..d0947b9416ac 100644 --- a/sys/contrib/pf/net/pf.c +++ b/sys/contrib/pf/net/pf.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #endif #ifdef __FreeBSD__ -#include "opt_mac.h" #include "opt_bpf.h" #include "opt_pf.h" diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index 404191173e75..c4b9713c2bba 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -28,8 +28,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" - #include #include #include diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index d88f49c58534..ff86e36859fe 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -34,8 +34,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" /* To set MNT_MULTILABEL. */ - #include #include #include diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index c637ea8900e9..46d794220fb6 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -40,8 +40,6 @@ * mkdir: want it ? */ -#include "opt_mac.h" - #include #include #include diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index e1179554d7f9..b3efc057a136 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + NFSDLOCKMUTEX; /* diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 69165e353b23..bfcbdcd77e36 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -52,9 +52,7 @@ #include #include -#ifdef MAC -#include -#endif +#include #include diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index a6bcbd20dd52..87b563de94ca 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kstack_pages.h" -#include "opt_mac.h" #include #include diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c index 7faf675106fd..1906fd74e60e 100644 --- a/sys/i386/ibcs2/ibcs2_misc.c +++ b/sys/i386/ibcs2/ibcs2_misc.c @@ -55,8 +55,6 @@ __FBSDID("$FreeBSD$"); * IBCS2 system calls that are implemented differently in BSD are * handled here. */ -#include "opt_mac.h" - #include #include #include diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 1f412c6f2749..98c2b83bbae1 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_init_path.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index a7ddb17cada4..7ec74a2a8765 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -70,8 +70,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c index 9f3724409d94..5296928ca972 100644 --- a/sys/kern/kern_alq.c +++ b/sys/kern/kern_alq.c @@ -27,8 +27,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c index 038515b99b05..fc0039a56e52 100644 --- a/sys/kern/kern_environment.c +++ b/sys/kern/kern_environment.c @@ -37,8 +37,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index f36f8037920e..fcd8530d734d 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include "opt_vm.h" #include diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 575fe9b71e1b..e24d7eaf3fe6 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 0c16c3ffa7f5..43afbbf7fb4b 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index b6a6d563b82f..7a8a090404af 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 6e680fb76fe6..7506b6f67543 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index f032d439d471..fbfd6cf8c923 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 26b0250f9c99..58fa314c71a5 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -28,7 +28,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_param.h" #include diff --git a/sys/kern/kern_priv.c b/sys/kern/kern_priv.c index 6dd7d4bc2c3c..352e502338d9 100644 --- a/sys/kern/kern_priv.c +++ b/sys/kern/kern_priv.c @@ -29,7 +29,6 @@ */ #include "opt_kdtrace.h" -#include "opt_mac.h" #include __FBSDID("$FreeBSD$"); diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 4e0bdf02a9f3..5deff6922e28 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 3fc2e7245830..158b92a06ea8 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_kdb.h" -#include "opt_mac.h" #include "opt_panic.h" #include "opt_show_busybufs.h" #include "opt_sched.h" diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index d65041a01c3c..a9c2a33566f4 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 5ab1ce5cf4a1..57f0206fb609 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_gdb.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 60c89d68c1a8..707c580ce250 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index ba54524e65ca..0f4636e876c7 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" -#include "opt_mac.h" #ifdef __i386__ #include "opt_npx.h" #endif diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index fb6b35da908f..ed48e544bcb5 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -91,8 +91,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 5e5695c3f507..93da80d26a82 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -32,8 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 2a2a3d02b182..89de07cabac8 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sysvipc.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index a99cf4ead45e..fa60acfbb179 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sysvipc.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index b374b5c9743f..b59aea596b0c 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_sysvipc.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index ea53885a9c72..a5ddd8857015 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_param.h" #include "opt_mbuf_stress_test.h" #include "opt_mbuf_profiling.h" diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c index 6fe83b080360..3dc4238cfb1c 100644 --- a/sys/kern/uipc_mbuf2.c +++ b/sys/kern/uipc_mbuf2.c @@ -65,8 +65,6 @@ __FBSDID("$FreeBSD$"); /*#define PULLDOWN_DEBUG*/ -#include "opt_mac.h" - #include #include #include diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index da233a6db519..5ca13f8844f7 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -34,7 +34,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_posix.h" #include diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 00fb438ff109..381915456ff1 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -55,8 +55,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 7341d3fb8e52..33679575805c 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -99,7 +99,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_zero.h" #include "opt_compat.h" diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 964547c855a9..4dfaf8464719 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sctp.h" #include "opt_compat.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index c9e7d397d896..a8fe7ca841cd 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index dfbff09bf3e7..ce1fa33b4270 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -35,8 +35,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index b75d364ee3fd..5f024a83706e 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index c76bd5beb009..7847f3556063 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 34a167f0d6b5..19a602607710 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include #include "opt_rootdevname.h" -#include "opt_mac.h" #define ROOTNAME "root_device" #define VFS_MOUNTARG_SIZE_MAX (1024 * 64) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 8d694f8639b6..47a504691692 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index a99d435612cb..72a53f8f7058 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 82527a666be9..702faaeaba85 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -37,8 +37,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/net/bpf.c b/sys/net/bpf.c index b944e2902cb0..c74d09fbf305 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bpf.h" -#include "opt_mac.h" #include "opt_netgraph.h" #include diff --git a/sys/net/if.c b/sys/net/if.c index ffff619d2794..1a5dcd29e651 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -34,7 +34,6 @@ #include "opt_inet6.h" #include "opt_inet.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_carp.h" #include diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c index 734acc5fb6e1..d8a331303bf1 100644 --- a/sys/net/if_atmsubr.c +++ b/sys/net/if_atmsubr.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_natm.h" #include diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 19122d6e1f0a..02ff42222e2f 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -35,7 +35,6 @@ #include "opt_inet6.h" #include "opt_ipx.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_netgraph.h" #include "opt_carp.h" #include "opt_mbuf_profiling.h" diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index 28f6e3a5ee3b..9074bffa5145 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -40,7 +40,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_mac.h" #include #include diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c index a5e0b19553ee..4f30db4a7bcd 100644 --- a/sys/net/if_fwsubr.c +++ b/sys/net/if_fwsubr.c @@ -32,7 +32,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 50279a255ffd..64057254594f 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -32,7 +32,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c index 99daf6692c1d..a6d25dc4d841 100644 --- a/sys/net/if_iso88025subr.c +++ b/sys/net/if_iso88025subr.c @@ -43,7 +43,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_mac.h" #include #include diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index cc9251b1a114..2bbccac2c379 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -39,7 +39,6 @@ #include "opt_inet6.h" #include "opt_ipx.h" #include "opt_route.h" -#include "opt_mac.h" #include #include diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index 1c2c6496c8f7..911804e46663 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -76,7 +76,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index df965beefad1..6b352e855c6e 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -20,7 +20,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_mac.h" #include #include diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c index fc328d33c9a8..d682230f26b8 100644 --- a/sys/netatalk/aarp.c +++ b/sys/netatalk/aarp.c @@ -51,7 +51,6 @@ */ #include "opt_atalk.h" -#include "opt_mac.h" #include #include diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c index d90b2e8f3f7c..2e82a2abeccb 100644 --- a/sys/netatalk/ddp_input.c +++ b/sys/netatalk/ddp_input.c @@ -49,8 +49,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" - #include #include #include diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c index 9581094f47c6..203bc9f50b97 100644 --- a/sys/netatalk/ddp_output.c +++ b/sys/netatalk/ddp_output.c @@ -23,8 +23,6 @@ /* $FreeBSD$ */ -#include "opt_mac.h" - #include #include #include diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 734dd023f54f..f0716d2c0b7e 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_carp.h" #include diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index d7dcfc5d90f5..e4f2b5ad1ade 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -50,7 +50,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_route.h" #include diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 140f41a99f4a..a0d6f6d027d9 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_ipsec.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 0894bfa4a083..0b72c652eb3e 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #if !defined(KLD_MODULE) #include "opt_inet.h" #include "opt_ipfw.h" -#include "opt_mac.h" #include "opt_sctp.h" #ifndef INET #error "IPDIVERT requires INET." diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index 65a2e2630f7c..760150a4ddb9 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #endif #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include "opt_route.h" #include diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 8c2ef26a3877..cfd27f0dc857 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipsec.h" -#include "opt_mac.h" #include #include diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index bb54b4d8abfc..bdc0c6d7c935 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipstealth.h" #include "opt_ipsec.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_carp.h" #include diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index fdea1180421d..65dc944cf35f 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" -#include "opt_mac.h" #include "opt_mrouting.h" #define _PIM_VT 1 diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c index dbb7d81e96a1..b59d708c6d42 100644 --- a/sys/netinet/ip_options.c +++ b/sys/netinet/ip_options.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipstealth.h" -#include "opt_mac.h" #include #include diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 65e06a03bd45..eded15c54bcf 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipfw.h" #include "opt_ipsec.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_mbuf_stress_test.h" #include "opt_mpath.h" #include "opt_sctp.h" diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 0c3108d7c4d1..806fc1d01357 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_ipsec.h" #include "opt_route.h" -#include "opt_mac.h" #include #include diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 674c77eedb36..eecf2fbcd26e 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include "opt_tcpdebug.h" #include diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index d014fdd8b3fe..3117fc3d476c 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include "opt_tcpdebug.h" #include diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 3c65a5412998..489617b5228c 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include "opt_tcpdebug.h" #include diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 27631839f73f..033e506c0c8b 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include #include diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 5ee60875a8e7..4c0fe947aa67 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_tcpdebug.h" #include diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index caeb2ae7665a..33be911b0781 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipfw.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include #include diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index d0f333d61669..2f4e256f1b59 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -32,8 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 800564cc4781..051cd9b889c1 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include #include diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index ffcd9966489a..ccfdb8fc0791 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_route.h" #include diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 11dcf249db50..590e6d6e7246 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include #include diff --git a/sys/nfsserver/nfs_srvkrpc.c b/sys/nfsserver/nfs_srvkrpc.c index 2b3b48a24dec..12f40c83f756 100644 --- a/sys/nfsserver/nfs_srvkrpc.c +++ b/sys/nfsserver/nfs_srvkrpc.c @@ -81,6 +81,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #ifndef NFS_LEGACYRPC static MALLOC_DEFINE(M_NFSSVC, "nfss_srvsock", "Nfs server structure"); diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index db48869184d9..13679ef4e978 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$"); * Socket operations for use by nfs */ -#include "opt_mac.h" - #include #include #include diff --git a/sys/security/audit/audit_syscalls.c b/sys/security/audit/audit_syscalls.c index bb1e7074ee76..18116609038f 100644 --- a/sys/security/audit/audit_syscalls.c +++ b/sys/security/audit/audit_syscalls.c @@ -30,8 +30,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index c5c13289ba75..7aae80828c4d 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_quota.h" #include "opt_ufs.h" #include "opt_ffs.h" diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 49ced4373aad..38c2543c40ba 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_quota.h" #include "opt_suiddir.h" #include "opt_ufs.h" diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 6b58294e0e4a..769a11d9c152 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -69,7 +69,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_swap.h" #include "opt_vm.h" diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index c79a0f444e32..fb9bb5f12a9d 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" -#include "opt_mac.h" #include #include