From 9c170fd1689fa8dcc514acb46840699eff751c67 Mon Sep 17 00:00:00 2001
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 6 Mar 2012 20:01:25 +0000
Subject: [PATCH] Disable the option VFS_ALLOW_NONMPSAFE by default on all the
 supported platforms. This will make every attempt to mount a non-mpsafe
 filesystem to the kernel forbidden, unless it is expressely compiled with
 VFS_ALLOW_NONMPSAFE option.

This patch is part of the effort of killing non-MPSAFE filesystems
from the tree.

No MFC is expected for this patch.
---
 UPDATING                  | 4 ++++
 sys/amd64/conf/DEFAULTS   | 3 ---
 sys/arm/conf/DEFAULTS     | 2 --
 sys/i386/conf/DEFAULTS    | 3 ---
 sys/ia64/conf/DEFAULTS    | 3 ---
 sys/mips/conf/DEFAULTS    | 2 --
 sys/pc98/conf/DEFAULTS    | 3 ---
 sys/powerpc/conf/DEFAULTS | 3 ---
 sys/sparc64/conf/DEFAULTS | 3 ---
 9 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/UPDATING b/UPDATING
index edb8d760600d..c48fec95358f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20120306:
+	Disable by default the option VFS_ALLOW_NONMPSAFE for all supported
+	platforms.
+
 20120229:
 	Now unix domain sockets behave "as expected" on	nullfs(5). Previously
 	nullfs(5) did not pass through all behaviours to the underlying layer,
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index e39a9e49a58d..2c221cb76bb9 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -22,6 +22,3 @@ options 	GEOM_PART_EBR_COMPAT
 options 	GEOM_PART_MBR
 
 options 	NEW_PCIB
-
-# Allow mounting non-MPSAFE filesystems
-options		VFS_ALLOW_NONMPSAFE
diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS
index 3546d4e027bf..591a0a14c8de 100644
--- a/sys/arm/conf/DEFAULTS
+++ b/sys/arm/conf/DEFAULTS
@@ -9,5 +9,3 @@ device		mem
 
 options 	GEOM_PART_BSD
 options 	GEOM_PART_MBR
-
-options		VFS_ALLOW_NONMPSAFE
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS
index 1c5cd96c3460..78d807c3d344 100644
--- a/sys/i386/conf/DEFAULTS
+++ b/sys/i386/conf/DEFAULTS
@@ -30,6 +30,3 @@ options 	NATIVE
 device		atpic
 
 options 	NEW_PCIB
-
-# Allow mounting non-MPSAFE filesystems
-options		VFS_ALLOW_NONMPSAFE
diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS
index e31e26b277d4..a3e10d614c67 100644
--- a/sys/ia64/conf/DEFAULTS
+++ b/sys/ia64/conf/DEFAULTS
@@ -20,6 +20,3 @@ options 	GEOM_PART_GPT
 options 	GEOM_PART_MBR
 
 options 	NEW_PCIB
-
-# Allow mounting non-MPSAFE filesystems
-options		VFS_ALLOW_NONMPSAFE
diff --git a/sys/mips/conf/DEFAULTS b/sys/mips/conf/DEFAULTS
index f015e89059a2..f09ef5440ce9 100644
--- a/sys/mips/conf/DEFAULTS
+++ b/sys/mips/conf/DEFAULTS
@@ -9,5 +9,3 @@ device		uart_ns8250
 
 options 	GEOM_PART_BSD
 options 	GEOM_PART_MBR
-
-options		VFS_ALLOW_NONMPSAFE
diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS
index 342a6041344a..6c8b561841aa 100644
--- a/sys/pc98/conf/DEFAULTS
+++ b/sys/pc98/conf/DEFAULTS
@@ -29,6 +29,3 @@ options 	GEOM_PART_PC98
 device		atpic
 
 options 	NEW_PCIB
-
-# Allow mounting non-MPSAFE filesystems
-options		VFS_ALLOW_NONMPSAFE
diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS
index c55560bc74a0..4faf6c1f581d 100644
--- a/sys/powerpc/conf/DEFAULTS
+++ b/sys/powerpc/conf/DEFAULTS
@@ -14,6 +14,3 @@ options 	GEOM_PART_APM
 options 	GEOM_PART_MBR
 
 options         NEW_PCIB
-
-# Allow mounting non-MPSAFE filesystems
-options		VFS_ALLOW_NONMPSAFE
diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS
index f1305a8e445a..c99480c8f86f 100644
--- a/sys/sparc64/conf/DEFAULTS
+++ b/sys/sparc64/conf/DEFAULTS
@@ -21,6 +21,3 @@ options 	GEOM_PART_VTOC8
 options 	SUNKBD_EMULATE_ATKBD
 
 options 	NEW_PCIB
-
-# Allow mounting non-MPSAFE filesystems
-options		VFS_ALLOW_NONMPSAFE