Index: rpc/svc_vc.c
===================================================================
--- rpc/svc_vc.c	(wersja 193371)
+++ rpc/svc_vc.c	(kopia robocza)
@@ -44,6 +44,8 @@
  * and a record/tcp stream.
  */
 
+#include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/kernel.h>
@@ -59,6 +61,8 @@
 #include <sys/uio.h>
 #include <netinet/tcp.h>
 
+#include <security/mac/mac_framework.h>
+
 #include <rpc/rpc.h>
 
 #include <rpc/rpc_com.h>
Index: kern/vfs_default.c
===================================================================
--- kern/vfs_default.c	(wersja 193371)
+++ kern/vfs_default.c	(kopia robocza)
@@ -35,6 +35,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
@@ -55,6 +57,8 @@
 #include <sys/dirent.h>
 #include <sys/poll.h>
 
+#include <security/mac/mac_framework.h>
+
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
Index: netinet/tcp_syncache.h
===================================================================
--- netinet/tcp_syncache.h	(wersja 193371)
+++ netinet/tcp_syncache.h	(kopia robocza)
@@ -34,6 +34,8 @@
 #define _NETINET_TCP_SYNCACHE_H_
 #ifdef _KERNEL
 
+#include "opt_mac.h"
+
 void	 syncache_init(void);
 void	 syncache_unreach(struct in_conninfo *, struct tcphdr *);
 int	 syncache_expand(struct in_conninfo *, struct tcpopt *,
Index: netinet/ip_mroute.c
===================================================================
--- netinet/ip_mroute.c	(wersja 193371)
+++ netinet/ip_mroute.c	(kopia robocza)
@@ -70,7 +70,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
-#include "opt_mac.h"
 #include "opt_mrouting.h"
 
 #define _PIM_VT 1
@@ -116,8 +115,6 @@
 
 #include <machine/in_cksum.h>
 
-#include <security/mac/mac_framework.h>
-
 #ifndef KTR_IPMF
 #define KTR_IPMF KTR_INET
 #endif
Index: netinet/ip_options.c
===================================================================
--- netinet/ip_options.c	(wersja 193371)
+++ netinet/ip_options.c	(kopia robocza)
@@ -33,7 +33,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ipstealth.h"
-#include "opt_mac.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,8 +66,6 @@
 
 #include <sys/socketvar.h>
 
-#include <security/mac/mac_framework.h>
-
 static int	ip_dosourceroute = 0;
 SYSCTL_INT(_net_inet_ip, IPCTL_SOURCEROUTE, sourceroute, CTLFLAG_RW,
     &ip_dosourceroute, 0, "Enable forwarding source routed IP packets");
Index: fs/unionfs/union_subr.c
===================================================================
--- fs/unionfs/union_subr.c	(wersja 193371)
+++ fs/unionfs/union_subr.c	(kopia robocza)
@@ -36,6 +36,8 @@
  * $FreeBSD$
  */
 
+#include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -52,6 +54,7 @@
 #include <sys/stat.h>
 #include <sys/resourcevar.h>
 
+#include <security/mac/mac_framework.h> /* XXX */
 #ifdef MAC
 #include <sys/mac.h>
 #endif
@@ -263,6 +266,7 @@
 		free(unp, M_UNIONFSNODE);
 		return (error);
 	}
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = insmntque(vp, mp);	/* XXX: Too early for mpsafe fs */
 	if (error != 0) {
 		free(unp, M_UNIONFSNODE);
Index: fs/nfsclient/nfs_clkrpc.c
===================================================================
--- fs/nfsclient/nfs_clkrpc.c	(wersja 193371)
+++ fs/nfsclient/nfs_clkrpc.c	(kopia robocza)
@@ -36,6 +36,7 @@
 
 #include "opt_inet6.h"
 #include "opt_kgssapi.h"
+#include "opt_mac.h"
 
 #include <fs/nfs/nfsport.h>
 
@@ -43,7 +44,9 @@
 #include <rpc/rpcsec_gss.h>
 #include <rpc/replay.h>
 
+#include <security/mac/mac_framework.h>
 
+
 NFSDLOCKMUTEX;
 
 SYSCTL_DECL(_vfs_newnfs);
Index: fs/nfs/nfs_commonacl.c
===================================================================
--- fs/nfs/nfs_commonacl.c	(wersja 193371)
+++ fs/nfs/nfs_commonacl.c	(kopia robocza)
@@ -28,6 +28,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_mac.h"
+
+#include <security/mac/mac_framework.h>
+
 #ifndef APPLEKEXT
 #include <fs/nfs/nfsport.h>
 
Index: fs/nfsserver/nfs_nfsdkrpc.c
===================================================================
--- fs/nfsserver/nfs_nfsdkrpc.c	(wersja 193371)
+++ fs/nfsserver/nfs_nfsdkrpc.c	(kopia robocza)
@@ -36,12 +36,15 @@
 
 #include "opt_inet6.h"
 #include "opt_kgssapi.h"
+#include "opt_mac.h"
 
 #include <fs/nfs/nfsport.h>
 
 #include <rpc/rpc.h>
 #include <rpc/rpcsec_gss.h>
 
+#include <security/mac/mac_framework.h>
+
 NFSDLOCKMUTEX;
 
 /*
Index: fs/udf/osta.c
===================================================================
--- fs/udf/osta.c	(wersja 193371)
+++ fs/udf/osta.c	(kopia robocza)
@@ -484,6 +484,7 @@
  */
 int IsIllegal(unicode_t ch)
 {
+/* XXX: MAC is defined for Mandatory Access Control, not for Apple Mac! */
 #ifdef MAC
 	/* Only illegal character on the MAC is the colon. */
 	if (ch == 0x003A) {
Index: nfsserver/nfs_srvkrpc.c
===================================================================
--- nfsserver/nfs_srvkrpc.c	(wersja 193371)
+++ nfsserver/nfs_srvkrpc.c	(kopia robocza)
@@ -37,6 +37,7 @@
 
 #include "opt_inet6.h"
 #include "opt_kgssapi.h"
+#include "opt_mac.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -73,6 +74,8 @@
 #include <rpc/rpcsec_gss.h>
 #include <rpc/replay.h>
 
+#include <security/mac/mac_framework.h>
+
 #include <nfs/xdr_subs.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
Index: dev/cxgb/ulp/tom/cxgb_cpl_io.c
===================================================================
--- dev/cxgb/ulp/tom/cxgb_cpl_io.c	(wersja 193371)
+++ dev/cxgb/ulp/tom/cxgb_cpl_io.c	(kopia robocza)
@@ -30,6 +30,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_mac.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
Index: net80211/ieee80211_output.c
===================================================================
--- net80211/ieee80211_output.c	(wersja 193371)
+++ net80211/ieee80211_output.c	(kopia robocza)
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
+#include "opt_mac.h"
 #include "opt_wlan.h"
 
 #include <sys/param.h>
@@ -45,6 +46,8 @@
 #include <net/if_media.h>
 #include <net/if_vlan_var.h>
 
+#include <security/mac/mac_framework.h>
+
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_regdomain.h>
 #ifdef IEEE80211_SUPPORT_SUPERG
Index: compat/linux/linux_stats.c
===================================================================
--- compat/linux/linux_stats.c	(wersja 193371)
+++ compat/linux/linux_stats.c	(kopia robocza)
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_mac.h"
 
 #include <sys/param.h>
 #include <sys/dirent.h>
@@ -59,8 +58,6 @@
 #include <compat/linux/linux_util.h>
 #include <compat/linux/linux_file.h>
 
-#include <security/mac/mac_framework.h>
-
 static void
 translate_vnhook_major_minor(struct vnode *vp, struct stat *sb)
 {
Index: i386/i386/sys_machdep.c
===================================================================
--- i386/i386/sys_machdep.c	(wersja 193371)
+++ i386/i386/sys_machdep.c	(kopia robocza)
@@ -33,7 +33,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_kstack_pages.h"
-#include "opt_mac.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
Index: netinet6/in6_pcb.c
===================================================================
--- netinet6/in6_pcb.c	(wersja 193371)
+++ netinet6/in6_pcb.c	(kopia robocza)
@@ -66,7 +66,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_mac.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,8 +104,6 @@
 #include <netinet6/scope6_var.h>
 #include <netinet6/vinet6.h>
 
-#include <security/mac/mac_framework.h>
-
 struct	in6_addr zeroin6_addr;
 
 int