Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[powerpc.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index cc28a69..b4799ef 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -459,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


@@ -504,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.
 


@@ -518,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.
 


@@ -1089,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>.
 


@@ -1103,8 +1112,8 @@ config HFS_FS
        help
          If you say Y here, you will be able to mount Macintosh-formatted
          floppy disks and hard drive partitions with full read-write access.
        help
          If you say Y here, you will be able to mount Macintosh-formatted
          floppy disks and hard drive partitions with full read-write access.

-         Please read <file:fs/hfs/HFS.txt> to learn about the available mount
-         options.
+         Please read <file:Documentation/filesystems/hfs.txt> to learn about
+         the available mount options.

 
          To compile this file system support as a module, choose M here: the
          module will be called hfs.
 
          To compile this file system support as a module, choose M here: the
          module will be called hfs.


@@ -1296,7 +1305,7 @@ config JFFS2_COMPRESSION_OPTIONS
        help
          Enabling this option allows you to explicitly choose which
          compression modules, if any, are enabled in JFFS2. Removing
        help
          Enabling this option allows you to explicitly choose which
          compression modules, if any, are enabled in JFFS2. Removing

-         compressors and mean you cannot read existing file systems,
+         compressors can mean you cannot read existing file systems,

          and enabling experimental compressors can mean that you
          write a file system which cannot be read by a standard kernel.
 
          and enabling experimental compressors can mean that you
          write a file system which cannot be read by a standard kernel.
 


@@ -2007,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


@@ -2121,4 +2130,3 @@ source "fs/nls/Kconfig"
 source "fs/dlm/Kconfig"
 
 endmenu
 source "fs/dlm/Kconfig"
 
 endmenu

-