From: Sascha Wildner <saw@online.de>
Date: Sun, 24 Sep 2017 12:39:15 +0000 (+0200)
Subject: kernel: Remove no longer used FFS_ROOT option.
X-Git-Tag: v5.1.0~56
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/8d4553cbc15826e9f72a89f86c6423c96241388f

kernel: Remove no longer used FFS_ROOT option.

Last used in code removed in 8840cec90a57df5e7c0f84c3c3c1e9abea7f2632.

While here, remove some no longer necessary opt_ffs.h #includes.
---

diff --git a/sys/conf/options b/sys/conf/options
index 6fc82f1964..33d24278dc 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -134,7 +134,6 @@ UFS_DIRHASH	opt_ufs.h
 # <filesystem>_ROOT option to control if it usable as root.  This list
 # allows these options to be present in config files already (though
 # they won't make any difference yet).
-FFS_ROOT	opt_ffs.h
 NFS_ROOT	opt_nfsroot.h
 
 # Options used only in subr_param.c.
@@ -667,3 +666,4 @@ SYSVSHM			opt_dontuse.h
 P1003_1B		opt_dontuse.h
 _KPOSIX_VERSION		opt_dontuse.h
 DSCHED_FQ		opt_dontuse.h
+FFS_ROOT		opt_dontuse.h
diff --git a/sys/config/LINT64 b/sys/config/LINT64
index 89aff1634b..91f78cb2a1 100644
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -501,7 +501,6 @@ options 	TMPFS			#Temporary filesystem
 options		UDF			#UDF filesystem
 
 # The xFS_ROOT options REQUIRE the associated ``options xFS''
-options 	FFS_ROOT		#FFS usable as root device
 options 	NFS_ROOT		#NFS usable as root device
 
 # Soft updates is technique for improving UFS filesystem speed and
diff --git a/sys/config/VKERNEL64 b/sys/config/VKERNEL64
index d862deee1b..f7a2cfa1a9 100644
--- a/sys/config/VKERNEL64
+++ b/sys/config/VKERNEL64
@@ -43,7 +43,6 @@ options		EXT2FS
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
-#options 	FFS_ROOT		#FFS usable as root device [keep this!]
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	MFS			#Memory Filesystem
diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC
index 8b4f1f47c1..e0cdf7c3f7 100644
--- a/sys/config/X86_64_GENERIC
+++ b/sys/config/X86_64_GENERIC
@@ -20,7 +20,6 @@ options 	HAMMER			#Hammer Filesystem
 options		HAMMER2			#HAMMER2 filesystem
 options		NULLFS			#NULL filesystem
 options 	FFS			#Berkeley Fast Filesystem
-options 	FFS_ROOT		#FFS usable as root device [keep this!]
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	MFS			#Memory Filesystem
diff --git a/sys/platform/pc64/x86_64/autoconf.c b/sys/platform/pc64/x86_64/autoconf.c
index 268964348a..e87408e1a6 100644
--- a/sys/platform/pc64/x86_64/autoconf.c
+++ b/sys/platform/pc64/x86_64/autoconf.c
@@ -43,7 +43,6 @@
  * and the drivers are initialized.
  */
 #include "opt_bootp.h"
-#include "opt_ffs.h"
 #include "opt_cd9660.h"
 #include "opt_nfs.h"
 #include "opt_nfsroot.h"
diff --git a/sys/platform/vkernel64/x86_64/autoconf.c b/sys/platform/vkernel64/x86_64/autoconf.c
index b682adc8ab..7a31650fa2 100644
--- a/sys/platform/vkernel64/x86_64/autoconf.c
+++ b/sys/platform/vkernel64/x86_64/autoconf.c
@@ -43,7 +43,6 @@
  * and the drivers are initialized.
  */
 #include "opt_bootp.h"
-#include "opt_ffs.h"
 #include "opt_cd9660.h"
 #include "opt_nfs.h"
 #include "opt_nfsroot.h"