mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [patch 1/2] menuconfig: transform NLS and DLM menus
@ 2007-09-25  8:10 Jan Engelhardt
  2007-09-25  8:10 ` [patch 2/2] menuconfig: transform Network Filesystems menu Jan Engelhardt
  2007-09-25 19:38 ` [patch 1/2] menuconfig: transform NLS and DLM menus Randy Dunlap
  0 siblings, 2 replies; 6+ messages in thread
From: Jan Engelhardt @ 2007-09-25  8:10 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Linux Kernel Mailing List, rdunlap, swhiteho


Changes NLS and DLM menus into a 'menuconfig' object
so that it can be disabled at once without having to enter
the menu first to disable the config option.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

---
 fs/dlm/Kconfig |    8 ++------
 fs/nls/Kconfig |   50 +++++---------------------------------------------
 2 files changed, 7 insertions(+), 51 deletions(-)

Index: linux-2.6.23/fs/dlm/Kconfig
===================================================================
--- linux-2.6.23.orig/fs/dlm/Kconfig
+++ linux-2.6.23/fs/dlm/Kconfig
@@ -1,8 +1,6 @@
-menu "Distributed Lock Manager"
-	depends on EXPERIMENTAL && INET
-
-config DLM
+menuconfig DLM
 	tristate "Distributed Lock Manager (DLM)"
+	depends on EXPERIMENTAL && INET
 	depends on SYSFS && (IPV6 || IPV6=n)
 	select CONFIGFS_FS
 	select IP_SCTP
@@ -17,5 +15,3 @@ config DLM_DEBUG
 	Under the debugfs mount point, the name of each lockspace will
 	appear as a file in the "dlm" directory.  The output is the
 	list of resource and locks the local node knows about.
-
-endmenu
Index: linux-2.6.23/fs/nls/Kconfig
===================================================================
--- linux-2.6.23.orig/fs/nls/Kconfig
+++ linux-2.6.23/fs/nls/Kconfig
@@ -2,10 +2,8 @@
 # Native language support configuration
 #
 
-menu "Native Language Support"
-
-config NLS
-	tristate "Base native language support"
+menuconfig NLS
+	tristate "Native language support"
 	---help---
 	  The base Native Language Support. A number of filesystems
 	  depend on it (e.g. FAT, JOLIET, NT, BEOS filesystems), as well
@@ -17,9 +15,10 @@ config NLS
 	  To compile this code as a module, choose M here: the module
 	  will be called nls_base.
 
+if NLS
+
 config NLS_DEFAULT
 	string "Default NLS Option"
-	depends on NLS
 	default "iso8859-1"
 	---help---
 	  The default NLS used when mounting file system. Note, that this is
@@ -39,7 +38,6 @@ config NLS_DEFAULT
 
 config NLS_CODEPAGE_437
 	tristate "Codepage 437 (United States, Canada)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored
@@ -52,7 +50,6 @@ config NLS_CODEPAGE_437
 
 config NLS_CODEPAGE_737
 	tristate "Codepage 737 (Greek)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored
@@ -65,7 +62,6 @@ config NLS_CODEPAGE_737
 
 config NLS_CODEPAGE_775
 	tristate "Codepage 775 (Baltic Rim)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored
@@ -79,7 +75,6 @@ config NLS_CODEPAGE_775
 
 config NLS_CODEPAGE_850
 	tristate "Codepage 850 (Europe)"
-	depends on NLS
 	---help---
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -96,7 +91,6 @@ config NLS_CODEPAGE_850
 
 config NLS_CODEPAGE_852
 	tristate "Codepage 852 (Central/Eastern Europe)"
-	depends on NLS
 	---help---
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -112,7 +106,6 @@ config NLS_CODEPAGE_852
 
 config NLS_CODEPAGE_855
 	tristate "Codepage 855 (Cyrillic)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -124,7 +117,6 @@ config NLS_CODEPAGE_855
 
 config NLS_CODEPAGE_857
 	tristate "Codepage 857 (Turkish)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -136,7 +128,6 @@ config NLS_CODEPAGE_857
 
 config NLS_CODEPAGE_860
 	tristate "Codepage 860 (Portuguese)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -148,7 +139,6 @@ config NLS_CODEPAGE_860
 
 config NLS_CODEPAGE_861
 	tristate "Codepage 861 (Icelandic)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -160,7 +150,6 @@ config NLS_CODEPAGE_861
 
 config NLS_CODEPAGE_862
 	tristate "Codepage 862 (Hebrew)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -172,7 +161,6 @@ config NLS_CODEPAGE_862
 
 config NLS_CODEPAGE_863
 	tristate "Codepage 863 (Canadian French)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -185,7 +173,6 @@ config NLS_CODEPAGE_863
 
 config NLS_CODEPAGE_864
 	tristate "Codepage 864 (Arabic)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -197,7 +184,6 @@ config NLS_CODEPAGE_864
 
 config NLS_CODEPAGE_865
 	tristate "Codepage 865 (Norwegian, Danish)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -210,7 +196,6 @@ config NLS_CODEPAGE_865
 
 config NLS_CODEPAGE_866
 	tristate "Codepage 866 (Cyrillic/Russian)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -223,7 +208,6 @@ config NLS_CODEPAGE_866
 
 config NLS_CODEPAGE_869
 	tristate "Codepage 869 (Greek)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -235,7 +219,6 @@ config NLS_CODEPAGE_869
 
 config NLS_CODEPAGE_936
 	tristate "Simplified Chinese charset (CP936, GB2312)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -248,7 +231,6 @@ config NLS_CODEPAGE_936
 
 config NLS_CODEPAGE_950
 	tristate "Traditional Chinese charset (Big5)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -261,7 +243,6 @@ config NLS_CODEPAGE_950
 
 config NLS_CODEPAGE_932
 	tristate "Japanese charsets (Shift-JIS, EUC-JP)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -275,7 +256,6 @@ config NLS_CODEPAGE_932
 
 config NLS_CODEPAGE_949
 	tristate "Korean charset (CP949, EUC-KR)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -287,7 +267,6 @@ config NLS_CODEPAGE_949
 
 config NLS_CODEPAGE_874
 	tristate "Thai charset (CP874, TIS-620)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -299,7 +278,6 @@ config NLS_CODEPAGE_874
 
 config NLS_ISO8859_8
 	tristate "Hebrew charsets (ISO-8859-8, CP1255)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -309,7 +287,6 @@ config NLS_ISO8859_8
 
 config NLS_CODEPAGE_1250
 	tristate "Windows CP1250 (Slavic/Central European Languages)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CDROMs
@@ -321,7 +298,6 @@ config NLS_CODEPAGE_1250
 
 config NLS_CODEPAGE_1251
 	tristate "Windows CP1251 (Bulgarian, Belarusian)"
-	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -334,7 +310,6 @@ config NLS_CODEPAGE_1251
 
 config NLS_ASCII
 	tristate "ASCII (United States)"
-	depends on NLS
 	help
 	  An ASCII NLS module is needed if you want to override the
 	  DEFAULT NLS with this very basic charset and don't want any
@@ -342,7 +317,6 @@ config NLS_ASCII
 
 config NLS_ISO8859_1
 	tristate "NLS ISO 8859-1  (Latin 1; Western European Languages)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -355,7 +329,6 @@ config NLS_ISO8859_1
 
 config NLS_ISO8859_2
 	tristate "NLS ISO 8859-2  (Latin 2; Slavic/Central European Languages)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -367,7 +340,6 @@ config NLS_ISO8859_2
 
 config NLS_ISO8859_3
 	tristate "NLS ISO 8859-3  (Latin 3; Esperanto, Galician, Maltese, Turkish)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -378,7 +350,6 @@ config NLS_ISO8859_3
 
 config NLS_ISO8859_4
 	tristate "NLS ISO 8859-4  (Latin 4; old Baltic charset)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -389,7 +360,6 @@ config NLS_ISO8859_4
 
 config NLS_ISO8859_5
 	tristate "NLS ISO 8859-5  (Cyrillic)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -401,7 +371,6 @@ config NLS_ISO8859_5
 
 config NLS_ISO8859_6
 	tristate "NLS ISO 8859-6  (Arabic)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -411,7 +380,6 @@ config NLS_ISO8859_6
 
 config NLS_ISO8859_7
 	tristate "NLS ISO 8859-7  (Modern Greek)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -421,7 +389,6 @@ config NLS_ISO8859_7
 
 config NLS_ISO8859_9
 	tristate "NLS ISO 8859-9  (Latin 5; Turkish)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -432,7 +399,6 @@ config NLS_ISO8859_9
 
 config NLS_ISO8859_13
 	tristate "NLS ISO 8859-13 (Latin 7; Baltic)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -443,7 +409,6 @@ config NLS_ISO8859_13
 
 config NLS_ISO8859_14
 	tristate "NLS ISO 8859-14 (Latin 8; Celtic)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -455,7 +420,6 @@ config NLS_ISO8859_14
 
 config NLS_ISO8859_15
 	tristate "NLS ISO 8859-15 (Latin 9; Western European Languages with Euro)"
-	depends on NLS
 	---help---
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -472,7 +436,6 @@ config NLS_ISO8859_15
 
 config NLS_KOI8_R
 	tristate "NLS KOI8-R (Russian)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -482,7 +445,6 @@ config NLS_KOI8_R
 
 config NLS_KOI8_U
 	tristate "NLS KOI8-U/RU (Ukrainian, Belarusian)"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -492,7 +454,6 @@ config NLS_KOI8_U
 
 config NLS_UTF8
 	tristate "NLS UTF-8"
-	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -500,5 +461,4 @@ config NLS_UTF8
 	  input/output character sets. Say Y here for the UTF-8 encoding of
 	  the Unicode/ISO9646 universal character set.
 
-endmenu
-
+endif # NLS

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [patch 2/2] menuconfig: transform Network Filesystems menu
  2007-09-25  8:10 [patch 1/2] menuconfig: transform NLS and DLM menus Jan Engelhardt
@ 2007-09-25  8:10 ` Jan Engelhardt
  2007-09-25  8:10   ` menuconfig idea: lift fs menu Jan Engelhardt
  2007-09-25 19:38   ` [patch 2/2] menuconfig: transform Network Filesystems menu Randy Dunlap
  2007-09-25 19:38 ` [patch 1/2] menuconfig: transform NLS and DLM menus Randy Dunlap
  1 sibling, 2 replies; 6+ messages in thread
From: Jan Engelhardt @ 2007-09-25  8:10 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Linux Kernel Mailing List, rdunlap, neilb, trond.myklebust, sfrench


Turn Network File Systems into a menuconfig so that it can be
disabled at once.

(Note: I added a "default y". If you do not like that, speak up.)

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

---
 fs/Kconfig |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Index: linux-2.6.23/fs/Kconfig
===================================================================
--- linux-2.6.23.orig/fs/Kconfig
+++ linux-2.6.23/fs/Kconfig
@@ -1516,8 +1516,20 @@ config UFS_DEBUG
 
 endmenu
 
-menu "Network File Systems"
+menuconfig NETWORK_FILESYSTEMS
+	bool "Network File Systems"
+	default y
 	depends on NET
+	---help---
+	  Say Y here to get to see options for network filesystems and
+	  filesystem-related networking code, such as NFS daemon and
+	  RPCSEC security modules.
+	  This option alone does not add any kernel code.
+
+	  If you say N, all options in this submenu will be skipped and
+	  disabled; if unsure, say Y here.
+
+if NETWORK_FILESYSTEMS
 
 config NFS_FS
 	tristate "NFS file system support"
@@ -2055,7 +2067,7 @@ config 9P_FS
 
 	  If unsure, say N.
 
-endmenu
+endif # NETWORK_FILESYSTEMS
 
 if BLOCK
 menu "Partition Types"

^ permalink raw reply	[flat|nested] 6+ messages in thread

* menuconfig idea: lift fs menu
  2007-09-25  8:10 ` [patch 2/2] menuconfig: transform Network Filesystems menu Jan Engelhardt
@ 2007-09-25  8:10   ` Jan Engelhardt
  2007-09-25 19:37     ` Randy Dunlap
  2007-09-25 19:38   ` [patch 2/2] menuconfig: transform Network Filesystems menu Randy Dunlap
  1 sibling, 1 reply; 6+ messages in thread
From: Jan Engelhardt @ 2007-09-25  8:10 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: Linux Kernel Mailing List, Andrew Morton


Lift the FS menu a bit by moving filesystem-specific
parts into their own menu.

This is an idea I had. Comments please, if any.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

---
 fs/Kconfig      |   19 ++++++++++++++++---
 fs/gfs2/Kconfig |    9 ++++++---
 fs/xfs/Kconfig  |   10 +++++-----
 3 files changed, 27 insertions(+), 11 deletions(-)

Index: linux-2.6.23/fs/Kconfig
===================================================================
--- linux-2.6.23.orig/fs/Kconfig
+++ linux-2.6.23/fs/Kconfig
@@ -6,6 +6,17 @@ menu "File systems"
 
 if BLOCK
 
+menuconfig EXT_FS
+	bool "Extended filesystem family"
+	default y
+	---help---
+	  Say Y here to get to see options for the 'ext' filesystems.
+	  This option alone does not add any kernel code.
+
+	  If you say N, all options in this submenu will be skipped and disabled.
+
+if EXT_FS
+
 config EXT2_FS
 	tristate "Second extended fs support"
 	help
@@ -272,7 +283,9 @@ config FS_MBCACHE
 	default y if EXT2_FS=y || EXT3_FS=y || EXT4DEV_FS=y
 	default m if EXT2_FS=m || EXT3_FS=m || EXT4DEV_FS=m
 
-config REISERFS_FS
+endif # EXT_FS
+
+menuconfig REISERFS_FS
 	tristate "Reiserfs support"
 	help
 	  Stores not just filenames but the files themselves in a balanced
@@ -358,7 +371,7 @@ config REISERFS_FS_SECURITY
 	  If you are not using a security module that requires using
 	  extended attributes for file security labels, say N.
 
-config JFS_FS
+menuconfig JFS_FS
 	tristate "JFS filesystem support"
 	select NLS
 	help
@@ -420,7 +433,7 @@ config FS_POSIX_ACL
 source "fs/xfs/Kconfig"
 source "fs/gfs2/Kconfig"
 
-config OCFS2_FS
+menuconfig OCFS2_FS
 	tristate "OCFS2 file system support"
 	depends on NET && SYSFS
 	select CONFIGFS_FS
Index: linux-2.6.23/fs/gfs2/Kconfig
===================================================================
--- linux-2.6.23.orig/fs/gfs2/Kconfig
+++ linux-2.6.23/fs/gfs2/Kconfig
@@ -1,4 +1,4 @@
-config GFS2_FS
+menuconfig GFS2_FS
 	tristate "GFS2 file system support"
 	depends on EXPERIMENTAL
 	select FS_POSIX_ACL
@@ -18,9 +18,10 @@ config GFS2_FS
 	  the below locking modules. Documentation and utilities for GFS2 can
 	  be found here: http://sources.redhat.com/cluster
 
+if GFS2_FS
+
 config GFS2_FS_LOCKING_NOLOCK
 	tristate "GFS2 \"nolock\" locking module"
-	depends on GFS2_FS
 	help
 	  Single node locking module for GFS2.
 
@@ -34,7 +35,7 @@ config GFS2_FS_LOCKING_NOLOCK
 
 config GFS2_FS_LOCKING_DLM
 	tristate "GFS2 DLM locking module"
-	depends on GFS2_FS && SYSFS && NET && INET && (IPV6 || IPV6=n)
+	depends on SYSFS && NET && INET && (IPV6 || IPV6=n)
 	select IP_SCTP if DLM_SCTP
 	select CONFIGFS_FS
 	select DLM
@@ -44,3 +45,5 @@ config GFS2_FS_LOCKING_DLM
 	  Most users of GFS2 will require this module. It provides the locking
 	  interface between GFS2 and the DLM, which is required to use GFS2
 	  in a cluster environment.
+
+endif # GFS2_FS
Index: linux-2.6.23/fs/xfs/Kconfig
===================================================================
--- linux-2.6.23.orig/fs/xfs/Kconfig
+++ linux-2.6.23/fs/xfs/Kconfig
@@ -1,4 +1,4 @@
-config XFS_FS
+menuconfig XFS_FS
 	tristate "XFS filesystem support"
 	depends on BLOCK
 	help
@@ -18,9 +18,10 @@ config XFS_FS
 	  system of your root partition is compiled as a module, you'll need
 	  to use an initial ramdisk (initrd) to boot.
 
+if XFS_FS
+
 config XFS_QUOTA
 	bool "XFS Quota support"
-	depends on XFS_FS
 	help
 	  If you say Y here, you will be able to set limits for disk usage on
 	  a per user and/or a per group basis under XFS.  XFS considers quota
@@ -37,7 +38,6 @@ config XFS_QUOTA
 
 config XFS_SECURITY
 	bool "XFS Security Label support"
-	depends on XFS_FS
 	help
 	  Security labels support alternative access control models
 	  implemented by security modules like SELinux.  This option
@@ -49,7 +49,6 @@ config XFS_SECURITY
 
 config XFS_POSIX_ACL
 	bool "XFS POSIX ACL support"
-	depends on XFS_FS
 	help
 	  POSIX Access Control Lists (ACLs) support permissions for users and
 	  groups beyond the owner/group/world scheme.
@@ -61,7 +60,6 @@ config XFS_POSIX_ACL
 
 config XFS_RT
 	bool "XFS Realtime subvolume support"
-	depends on XFS_FS
 	help
 	  If you say Y here you will be able to mount and use XFS filesystems
 	  which contain a realtime subvolume.  The realtime subvolume is a
@@ -76,3 +74,5 @@ config XFS_RT
 	  See the xfs man page in section 5 for additional information.
 
 	  If unsure, say N.
+
+endif # XFS_FS

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: menuconfig idea: lift fs menu
  2007-09-25  8:10   ` menuconfig idea: lift fs menu Jan Engelhardt
@ 2007-09-25 19:37     ` Randy Dunlap
  0 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2007-09-25 19:37 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: Linux Kernel Mailing List, Andrew Morton

On Tue, 25 Sep 2007 10:10:26 +0200 (CEST) Jan Engelhardt wrote:

> 
> Lift the FS menu a bit by moving filesystem-specific
> parts into their own menu.
> 
> This is an idea I had. Comments please, if any.
> 
> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Hi Jan,

The current fs menu is too long IMO, so this helps.

This leaves minixfs and romfs in the main fs menu (where they were,
i.e., no change).  I would move them to the Miscellaneous fs menu...
and then move Quota support to after Dnotify so that Inotify & Dnotify
are next to each other.  Yes, I realize that they were already
separated by Quota and that this patch did not cause that.


> ---
>  fs/Kconfig      |   19 ++++++++++++++++---
>  fs/gfs2/Kconfig |    9 ++++++---
>  fs/xfs/Kconfig  |   10 +++++-----
>  3 files changed, 27 insertions(+), 11 deletions(-)
> 
> Index: linux-2.6.23/fs/Kconfig
> ===================================================================
> --- linux-2.6.23.orig/fs/Kconfig
> +++ linux-2.6.23/fs/Kconfig
> @@ -6,6 +6,17 @@ menu "File systems"
>  
>  if BLOCK
>  
> +menuconfig EXT_FS
> +	bool "Extended filesystem family"
> +	default y
> +	---help---
> +	  Say Y here to get to see options for the 'ext' filesystems.
> +	  This option alone does not add any kernel code.
> +
> +	  If you say N, all options in this submenu will be skipped and disabled.
> +
> +if EXT_FS
> +
>  config EXT2_FS
>  	tristate "Second extended fs support"
>  	help
> @@ -272,7 +283,9 @@ config FS_MBCACHE
>  	default y if EXT2_FS=y || EXT3_FS=y || EXT4DEV_FS=y
>  	default m if EXT2_FS=m || EXT3_FS=m || EXT4DEV_FS=m
>  
> -config REISERFS_FS
> +endif # EXT_FS
> +
> +menuconfig REISERFS_FS
>  	tristate "Reiserfs support"
>  	help
>  	  Stores not just filenames but the files themselves in a balanced
> @@ -358,7 +371,7 @@ config REISERFS_FS_SECURITY
>  	  If you are not using a security module that requires using
>  	  extended attributes for file security labels, say N.
>  
> -config JFS_FS
> +menuconfig JFS_FS
>  	tristate "JFS filesystem support"
>  	select NLS
>  	help
> @@ -420,7 +433,7 @@ config FS_POSIX_ACL
>  source "fs/xfs/Kconfig"
>  source "fs/gfs2/Kconfig"
>  
> -config OCFS2_FS
> +menuconfig OCFS2_FS
>  	tristate "OCFS2 file system support"
>  	depends on NET && SYSFS
>  	select CONFIGFS_FS
> Index: linux-2.6.23/fs/gfs2/Kconfig
> ===================================================================
> --- linux-2.6.23.orig/fs/gfs2/Kconfig
> +++ linux-2.6.23/fs/gfs2/Kconfig
> @@ -1,4 +1,4 @@
> -config GFS2_FS
> +menuconfig GFS2_FS
>  	tristate "GFS2 file system support"
>  	depends on EXPERIMENTAL
>  	select FS_POSIX_ACL
> @@ -18,9 +18,10 @@ config GFS2_FS
>  	  the below locking modules. Documentation and utilities for GFS2 can
>  	  be found here: http://sources.redhat.com/cluster
>  
> +if GFS2_FS
> +
>  config GFS2_FS_LOCKING_NOLOCK
>  	tristate "GFS2 \"nolock\" locking module"
> -	depends on GFS2_FS
>  	help
>  	  Single node locking module for GFS2.
>  
> @@ -34,7 +35,7 @@ config GFS2_FS_LOCKING_NOLOCK
>  
>  config GFS2_FS_LOCKING_DLM
>  	tristate "GFS2 DLM locking module"
> -	depends on GFS2_FS && SYSFS && NET && INET && (IPV6 || IPV6=n)
> +	depends on SYSFS && NET && INET && (IPV6 || IPV6=n)
>  	select IP_SCTP if DLM_SCTP
>  	select CONFIGFS_FS
>  	select DLM
> @@ -44,3 +45,5 @@ config GFS2_FS_LOCKING_DLM
>  	  Most users of GFS2 will require this module. It provides the locking
>  	  interface between GFS2 and the DLM, which is required to use GFS2
>  	  in a cluster environment.
> +
> +endif # GFS2_FS
> Index: linux-2.6.23/fs/xfs/Kconfig
> ===================================================================
> --- linux-2.6.23.orig/fs/xfs/Kconfig
> +++ linux-2.6.23/fs/xfs/Kconfig
> @@ -1,4 +1,4 @@
> -config XFS_FS
> +menuconfig XFS_FS
>  	tristate "XFS filesystem support"
>  	depends on BLOCK
>  	help
> @@ -18,9 +18,10 @@ config XFS_FS
>  	  system of your root partition is compiled as a module, you'll need
>  	  to use an initial ramdisk (initrd) to boot.
>  
> +if XFS_FS
> +
>  config XFS_QUOTA
>  	bool "XFS Quota support"
> -	depends on XFS_FS
>  	help
>  	  If you say Y here, you will be able to set limits for disk usage on
>  	  a per user and/or a per group basis under XFS.  XFS considers quota
> @@ -37,7 +38,6 @@ config XFS_QUOTA
>  
>  config XFS_SECURITY
>  	bool "XFS Security Label support"
> -	depends on XFS_FS
>  	help
>  	  Security labels support alternative access control models
>  	  implemented by security modules like SELinux.  This option
> @@ -49,7 +49,6 @@ config XFS_SECURITY
>  
>  config XFS_POSIX_ACL
>  	bool "XFS POSIX ACL support"
> -	depends on XFS_FS
>  	help
>  	  POSIX Access Control Lists (ACLs) support permissions for users and
>  	  groups beyond the owner/group/world scheme.
> @@ -61,7 +60,6 @@ config XFS_POSIX_ACL
>  
>  config XFS_RT
>  	bool "XFS Realtime subvolume support"
> -	depends on XFS_FS
>  	help
>  	  If you say Y here you will be able to mount and use XFS filesystems
>  	  which contain a realtime subvolume.  The realtime subvolume is a
> @@ -76,3 +74,5 @@ config XFS_RT
>  	  See the xfs man page in section 5 for additional information.
>  
>  	  If unsure, say N.
> +
> +endif # XFS_FS
> 


---
~Randy
Phaedrus says that Quality is about caring.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [patch 1/2] menuconfig: transform NLS and DLM menus
  2007-09-25  8:10 [patch 1/2] menuconfig: transform NLS and DLM menus Jan Engelhardt
  2007-09-25  8:10 ` [patch 2/2] menuconfig: transform Network Filesystems menu Jan Engelhardt
@ 2007-09-25 19:38 ` Randy Dunlap
  1 sibling, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2007-09-25 19:38 UTC (permalink / raw)
  To: Jan Engelhardt
  Cc: Andrew Morton, Linux Kernel Mailing List, rdunlap, swhiteho

On Tue, 25 Sep 2007 10:10:14 +0200 (CEST) Jan Engelhardt wrote:

> 
> Changes NLS and DLM menus into a 'menuconfig' object
> so that it can be disabled at once without having to enter
> the menu first to disable the config option.
> 
> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

> ---
>  fs/dlm/Kconfig |    8 ++------
>  fs/nls/Kconfig |   50 +++++---------------------------------------------
>  2 files changed, 7 insertions(+), 51 deletions(-)

---
~Randy
Phaedrus says that Quality is about caring.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [patch 2/2] menuconfig: transform Network Filesystems menu
  2007-09-25  8:10 ` [patch 2/2] menuconfig: transform Network Filesystems menu Jan Engelhardt
  2007-09-25  8:10   ` menuconfig idea: lift fs menu Jan Engelhardt
@ 2007-09-25 19:38   ` Randy Dunlap
  1 sibling, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2007-09-25 19:38 UTC (permalink / raw)
  To: Jan Engelhardt
  Cc: Andrew Morton, Linux Kernel Mailing List, rdunlap, neilb,
	trond.myklebust, sfrench

On Tue, 25 Sep 2007 10:10:19 +0200 (CEST) Jan Engelhardt wrote:

> 
> Turn Network File Systems into a menuconfig so that it can be
> disabled at once.
> 
> (Note: I added a "default y". If you do not like that, speak up.)
> 
> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

> ---
>  fs/Kconfig |   16 ++++++++++++++--
>  1 file changed, 14 insertions(+), 2 deletions(-)


---
~Randy
Phaedrus says that Quality is about caring.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2007-09-25 19:40 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-09-25  8:10 [patch 1/2] menuconfig: transform NLS and DLM menus Jan Engelhardt
2007-09-25  8:10 ` [patch 2/2] menuconfig: transform Network Filesystems menu Jan Engelhardt
2007-09-25  8:10   ` menuconfig idea: lift fs menu Jan Engelhardt
2007-09-25 19:37     ` Randy Dunlap
2007-09-25 19:38   ` [patch 2/2] menuconfig: transform Network Filesystems menu Randy Dunlap
2007-09-25 19:38 ` [patch 1/2] menuconfig: transform NLS and DLM menus Randy Dunlap

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®