Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[powerpc.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 7d6ae36..e9749b0 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -70,6 +70,7 @@ config FS_XIP
 
 config EXT3_FS
        tristate "Ext3 journalling file system support"
 
 config EXT3_FS
        tristate "Ext3 journalling file system support"

+       select JBD

        help
          This is the journaling version of the Second extended file system
          (often called ext3), the de facto standard Linux file system
        help
          This is the journaling version of the Second extended file system
          (often called ext3), the de facto standard Linux file system


@@ -138,23 +139,20 @@ config EXT3_FS_SECURITY
          extended attributes for file security labels, say N.
 
 config JBD
          extended attributes for file security labels, say N.
 
 config JBD

-# CONFIG_JBD could be its own option (even modular), but until there are
-# other users than ext3, we will simply make it be the same as CONFIG_EXT3_FS
-# dep_tristate '  Journal Block Device support (JBD for ext3)' CONFIG_JBD $CONFIG_EXT3_FS

        tristate
        tristate

-       default EXT3_FS

        help
          This is a generic journaling layer for block devices.  It is
        help
          This is a generic journaling layer for block devices.  It is

-         currently used by the ext3 file system, but it could also be used to
-         add journal support to other file systems or block devices such as
-         RAID or LVM.
+         currently used by the ext3 and OCFS2 file systems, but it could
+         also be used to add journal support to other file systems or block
+         devices such as RAID or LVM.

 
 

-         If you are using the ext3 file system, you need to say Y here. If
-         you are not using ext3 then you will probably want to say N.
+         If you are using the ext3 or OCFS2 file systems, you need to
+         say Y here. If you are not using ext3 OCFS2 then you will probably
+         want to say N.

 
          To compile this device as a module, choose M here: the module will be
 
          To compile this device as a module, choose M here: the module will be

-         called jbd.  If you are compiling ext3 into the kernel, you cannot
-         compile this code as a module.
+         called jbd.  If you are compiling ext3 or OCFS2 into the kernel,
+         you cannot compile this code as a module.

 
 config JBD_DEBUG
        bool "JBD (ext3) debugging support"
 
 config JBD_DEBUG
        bool "JBD (ext3) debugging support"


@@ -326,6 +324,38 @@ config FS_POSIX_ACL
 
 source "fs/xfs/Kconfig"
 
 
 source "fs/xfs/Kconfig"
 

+config OCFS2_FS
+       tristate "OCFS2 file system support (EXPERIMENTAL)"
+       depends on NET && EXPERIMENTAL
+       select CONFIGFS_FS
+       select JBD
+       select CRC32
+       select INET
+       help
+         OCFS2 is a general purpose extent based shared disk cluster file
+         system with many similarities to ext3. It supports 64 bit inode
+         numbers, and has automatically extending metadata groups which may
+         also make it attractive for non-clustered use.
+
+         You'll want to install the ocfs2-tools package in order to at least
+         get "mount.ocfs2".
+
+         Project web page:    http://oss.oracle.com/projects/ocfs2
+         Tools web page:      http://oss.oracle.com/projects/ocfs2-tools
+         OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
+
+         Note: Features which OCFS2 does not support yet:
+                 - extended attributes
+                 - shared writeable mmap
+                 - loopback is supported, but data written will not
+                   be cluster coherent.
+                 - quotas
+                 - cluster aware flock
+                 - Directory change notification (F_NOTIFY)
+                 - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
+                 - POSIX ACLs
+                 - readpages / writepages (not user visible)
+

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


@@ -768,7 +798,7 @@ config PROC_KCORE
 
 config PROC_VMCORE
         bool "/proc/vmcore support (EXPERIMENTAL)"
 
 config PROC_VMCORE
         bool "/proc/vmcore support (EXPERIMENTAL)"

-        depends on PROC_FS && EMBEDDED && EXPERIMENTAL && CRASH_DUMP
+        depends on PROC_FS && EXPERIMENTAL && CRASH_DUMP

         help
         Exports the dump image of crashed kernel in ELF format.
 
         help
         Exports the dump image of crashed kernel in ELF format.
 


@@ -841,6 +871,18 @@ config RELAYFS_FS
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config CONFIGFS_FS
+       tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       help
+         configfs is a ram-based filesystem that provides the converse
+         of sysfs's functionality. Where sysfs is a filesystem-based
+         view of kernel objects, configfs is a filesystem-based manager
+         of kernel objects, or config_items.
+
+         Both sysfs and configfs can and should exist together on the
+         same system. One is not a replacement for the other.
+

 endmenu
 
 menu "Miscellaneous filesystems"
 endmenu
 
 menu "Miscellaneous filesystems"


@@ -1283,7 +1325,7 @@ config UFS_FS
 
 config UFS_FS_WRITE
        bool "UFS file system write support (DANGEROUS)"
 
 config UFS_FS_WRITE
        bool "UFS file system write support (DANGEROUS)"

-       depends on UFS_FS && EXPERIMENTAL
+       depends on UFS_FS && EXPERIMENTAL && BROKEN

        help
          Say Y here if you want to try writing to UFS partitions. This is
          experimental, so you should back up your UFS partitions beforehand.
        help
          Say Y here if you want to try writing to UFS partitions. This is
          experimental, so you should back up your UFS partitions beforehand.


@@ -1601,9 +1643,10 @@ config CIFS
          PC operating systems.  The CIFS protocol is fully supported by 
          file servers such as Windows 2000 (including Windows 2003, NT 4  
          and Windows XP) as well by Samba (which provides excellent CIFS
          PC operating systems.  The CIFS protocol is fully supported by 
          file servers such as Windows 2000 (including Windows 2003, NT 4  
          and Windows XP) as well by Samba (which provides excellent CIFS

-         server support for Linux and many other operating systems). Currently
-         you must use the smbfs client filesystem to access older SMB servers
-         such as Windows 9x and OS/2.
+         server support for Linux and many other operating systems). Limited
+         support for Windows ME and similar servers is provided as well. 
+         You must use the smbfs client filesystem to access older SMB servers
+         such as OS/2 and DOS.

 
          The intent of the cifs module is to provide an advanced
          network file system client for mounting to CIFS compliant servers, 
 
          The intent of the cifs module is to provide an advanced
          network file system client for mounting to CIFS compliant servers, 


@@ -1614,7 +1657,7 @@ config CIFS
          cifs if running only a (Samba) server. It is possible to enable both
          smbfs and cifs (e.g. if you are using CIFS for accessing Windows 2003
          and Samba 3 servers, and smbfs for accessing old servers). If you need 
          cifs if running only a (Samba) server. It is possible to enable both
          smbfs and cifs (e.g. if you are using CIFS for accessing Windows 2003
          and Samba 3 servers, and smbfs for accessing old servers). If you need 

-         to mount to Samba or Windows 2003 servers from this machine, say Y.
+         to mount to Samba or Windows from this machine, say Y.

 
 config CIFS_STATS
         bool "CIFS statistics"
 
 config CIFS_STATS
         bool "CIFS statistics"


@@ -1623,8 +1666,22 @@ config CIFS_STATS
           Enabling this option will cause statistics for each server share
          mounted by the cifs client to be displayed in /proc/fs/cifs/Stats
 
           Enabling this option will cause statistics for each server share
          mounted by the cifs client to be displayed in /proc/fs/cifs/Stats
 

+config CIFS_STATS2
+       bool "CIFS extended statistics"
+       depends on CIFS_STATS
+       help
+         Enabling this option will allow more detailed statistics on SMB
+         request timing to be displayed in /proc/fs/cifs/DebugData and also
+         allow optional logging of slow responses to dmesg (depending on the
+         value of /proc/fs/cifs/cifsFYI, see fs/cifs/README for more details).
+         These additional statistics may have a minor effect on performance
+         and memory utilization.
+
+         Unless you are a developer or are doing network performance analysis
+         or tuning, say N.
+

 config CIFS_XATTR
 config CIFS_XATTR

-        bool "CIFS extended attributes (EXPERIMENTAL)"
+        bool "CIFS extended attributes"

         depends on CIFS
         help
           Extended attributes are name:value pairs associated with inodes by
         depends on CIFS
         help
           Extended attributes are name:value pairs associated with inodes by


@@ -1636,11 +1693,11 @@ config CIFS_XATTR
           prefaced by the user namespace prefix. The system namespace
           (used by some filesystems to store ACLs) is not supported at
           this time.
           prefaced by the user namespace prefix. The system namespace
           (used by some filesystems to store ACLs) is not supported at
           this time.

-                                                                                                    
+

           If unsure, say N.
 
 config CIFS_POSIX
           If unsure, say N.
 
 config CIFS_POSIX

-        bool "CIFS POSIX Extensions (EXPERIMENTAL)"
+        bool "CIFS POSIX Extensions"

         depends on CIFS_XATTR
         help
           Enabling this option will cause the cifs client to attempt to
         depends on CIFS_XATTR
         help
           Enabling this option will cause the cifs client to attempt to


@@ -1653,10 +1710,28 @@ config CIFS_POSIX
 
 config CIFS_EXPERIMENTAL
          bool "CIFS Experimental Features (EXPERIMENTAL)"
 
 config CIFS_EXPERIMENTAL
          bool "CIFS Experimental Features (EXPERIMENTAL)"

-         depends on CIFS
+         depends on CIFS && EXPERIMENTAL
+         help
+           Enables cifs features under testing. These features are
+           experimental and currently include support for writepages
+           (multipage writebehind performance improvements) and directory
+           change notification ie fcntl(F_DNOTIFY) as well as some security
+           improvements.  Some also depend on setting at runtime the
+           pseudo-file /proc/fs/cifs/Experimental (which is disabled by
+           default). See the file fs/cifs/README for more details.
+
+           If unsure, say N.
+
+config CIFS_UPCALL
+         bool "CIFS Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
+         depends on CIFS_EXPERIMENTAL
+         select CONNECTOR

          help
          help

-           Enables cifs features under testing. These features
-           are highly experimental.  If unsure, say N.
+           Enables an upcall mechanism for CIFS which will be used to contact
+           userspace helper utilities to provide SPNEGO packaged Kerberos
+           tickets which are needed to mount to certain secure servers
+           (for which more secure Kerberos authentication is required). If
+           unsure, say N.

 
 config NCP_FS
        tristate "NCP file system support (to mount NetWare volumes)"
 
 config NCP_FS
        tristate "NCP file system support (to mount NetWare volumes)"