Pull suspend-2.6.24 into release branch

[safe/jmp/linux-2.6] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index dc06033..635f3e2 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -140,6 +140,7 @@ config EXT4DEV_FS
        tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        select JBD2
        tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        select JBD2

+       select CRC16

        help
          Ext4dev is a predecessor filesystem of the next generation
          extended fs ext4, based on ext3 filesystem code. It will be
        help
          Ext4dev is a predecessor filesystem of the next generation
          extended fs ext4, based on ext3 filesystem code. It will be


@@ -219,7 +220,7 @@ config JBD
 
 config JBD_DEBUG
        bool "JBD (ext3) debugging support"
 
 config JBD_DEBUG
        bool "JBD (ext3) debugging support"

-       depends on JBD
+       depends on JBD && DEBUG_FS

        help
          If you are using the ext3 journaled file system (or potentially any
          other file system/device using JBD), this option allows you to
        help
          If you are using the ext3 journaled file system (or potentially any
          other file system/device using JBD), this option allows you to


@@ -228,10 +229,10 @@ config JBD_DEBUG
          debugging output will be turned off.
 
          If you select Y here, then you will be able to turn on debugging
          debugging output will be turned off.
 
          If you select Y here, then you will be able to turn on debugging

-         with "echo N > /proc/sys/fs/jbd-debug", where N is a number between
-         1 and 5, the higher the number, the more debugging output is
-         generated.  To turn debugging off again, do
-         "echo 0 > /proc/sys/fs/jbd-debug".
+         with "echo N > /sys/kernel/debug/jbd/jbd-debug", where N is a
+         number between 1 and 5, the higher the number, the more debugging
+         output is generated.  To turn debugging off again, do
+         "echo 0 > /sys/kernel/debug/jbd/jbd-debug".

 
 config JBD2
        tristate
 
 config JBD2
        tristate


@@ -458,6 +459,15 @@ config OCFS2_DEBUG_MASKLOG
          This option will enlarge your kernel, but it allows debugging of
          ocfs2 filesystem issues.
 
          This option will enlarge your kernel, but it allows debugging of
          ocfs2 filesystem issues.
 

+config OCFS2_DEBUG_FS
+       bool "OCFS2 expensive checks"
+       depends on OCFS2_FS
+       default n
+       help
+         This option will enable expensive consistency checks. Enable
+         this option for debugging only as it is likely to decrease
+         performance of the filesystem.
+

 config MINIX_FS
        tristate "Minix fs support"
        help
 config MINIX_FS
        tristate "Minix fs support"
        help


@@ -503,7 +513,7 @@ config INOTIFY
          including multiple file events, one-shot support, and unmount
          notification.
 
          including multiple file events, one-shot support, and unmount
          notification.
 

-         For more information, see Documentation/filesystems/inotify.txt
+         For more information, see <file:Documentation/filesystems/inotify.txt>

 
          If unsure, say Y.
 
 
          If unsure, say Y.
 


@@ -517,7 +527,7 @@ config INOTIFY_USER
          directories via a single open fd.  Events are read from the file
          descriptor, which is also select()- and poll()-able.
 
          directories via a single open fd.  Events are read from the file
          descriptor, which is also select()- and poll()-able.
 

-         For more information, see Documentation/filesystems/inotify.txt
+         For more information, see <file:Documentation/filesystems/inotify.txt>

 
          If unsure, say Y.
 
 
          If unsure, say Y.
 


@@ -1088,7 +1098,7 @@ config ECRYPT_FS
        depends on EXPERIMENTAL && KEYS && CRYPTO && NET
        help
          Encrypted filesystem that operates on the VFS layer.  See
        depends on EXPERIMENTAL && KEYS && CRYPTO && NET
        help
          Encrypted filesystem that operates on the VFS layer.  See

-         <file:Documentation/ecryptfs.txt> to learn more about
+         <file:Documentation/filesystems/ecryptfs.txt> to learn more about

          eCryptfs.  Userspace components are required and can be
          obtained from <http://ecryptfs.sf.net>.
 
          eCryptfs.  Userspace components are required and can be
          obtained from <http://ecryptfs.sf.net>.
 


@@ -1547,8 +1557,20 @@ config UFS_DEBUG
 
 endmenu
 
 
 endmenu
 

-menu "Network File Systems"
+menuconfig NETWORK_FILESYSTEMS
+       bool "Network File Systems"
+       default y

        depends on NET
        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"
 
 config NFS_FS
        tristate "NFS file system support"


@@ -1994,7 +2016,7 @@ config CIFS_EXPERIMENTAL
 config CIFS_UPCALL
          bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
          depends on CIFS_EXPERIMENTAL
 config CIFS_UPCALL
          bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
          depends on CIFS_EXPERIMENTAL

-         depends on CONNECTOR
+         depends on KEYS

          help
            Enables an upcall mechanism for CIFS which will be used to contact
            userspace helper utilities to provide SPNEGO packaged Kerberos
          help
            Enables an upcall mechanism for CIFS which will be used to contact
            userspace helper utilities to provide SPNEGO packaged Kerberos


@@ -2094,7 +2116,7 @@ config 9P_FS
 
          If unsure, say N.
 
 
          If unsure, say N.
 

-endmenu
+endif # NETWORK_FILESYSTEMS

 
 if BLOCK
 menu "Partition Types"
 
 if BLOCK
 menu "Partition Types"