ide: IDE_AFLAG_WP -> IDE_DFLAG_WP

[linux-2.6-omap-h63xx.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index abccb5dab9a8b3297e1b41a9c76631a357de935e..9e9d70c02a07c9a8876f71c3445ac5092c563810 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -136,37 +136,51 @@ config EXT3_FS_SECURITY
          If you are not using a security module that requires using
          extended attributes for file security labels, say N.
 
          If you are not using a security module that requires using
          extended attributes for file security labels, say N.
 

-config EXT4DEV_FS
-       tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+config EXT4_FS
+       tristate "The Extended 4 (ext4) filesystem"

        select JBD2
        select CRC16
        help
        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
-         renamed ext4 fs later, once ext4dev is mature and stabilized.
+         This is the next generation of the ext3 filesystem.

 
          Unlike the change from ext2 filesystem to ext3 filesystem,
 
          Unlike the change from ext2 filesystem to ext3 filesystem,

-         the on-disk format of ext4dev is not the same as ext3 any more:
-         it is based on extent maps and it supports 48-bit physical block
-         numbers. These combined on-disk format changes will allow
-         ext4dev/ext4 to handle more than 16 TB filesystem volumes --
-         a hard limit that ext3 cannot overcome without changing the
-         on-disk format.
-
-         Other than extent maps and 48-bit block numbers, ext4dev also is
-         likely to have other new features such as persistent preallocation,
-         high resolution time stamps, and larger file support etc.  These
-         features will be added to ext4dev gradually.
+         the on-disk format of ext4 is not forwards compatible with
+         ext3; it is based on extent maps and it supports 48-bit
+         physical block numbers.  The ext4 filesystem also supports delayed
+         allocation, persistent preallocation, high resolution time stamps,
+         and a number of other features to improve performance and speed
+         up fsck time.  For more information, please see the web pages at
+         http://ext4.wiki.kernel.org.
+
+         The ext4 filesystem will support mounting an ext3
+         filesystem; while there will be some performance gains from
+         the delayed allocation and inode table readahead, the best
+         performance gains will require enabling ext4 features in the
+         filesystem, or formating a new filesystem as an ext4
+         filesystem initially.

 
          To compile this file system support as a module, choose M here. The
          module will be called ext4dev.
 
          If unsure, say N.
 
 
          To compile this file system support as a module, choose M here. The
          module will be called ext4dev.
 
          If unsure, say N.
 

-config EXT4DEV_FS_XATTR
-       bool "Ext4dev extended attributes"
-       depends on EXT4DEV_FS
+config EXT4DEV_COMPAT
+       bool "Enable ext4dev compatibility"
+       depends on EXT4_FS
+       help
+         Starting with 2.6.28, the name of the ext4 filesystem was
+         renamed from ext4dev to ext4.  Unfortunately there are some
+         legacy userspace programs (such as klibc's fstype) have
+         "ext4dev" hardcoded.
+
+         To enable backwards compatibility so that systems that are
+         still expecting to mount ext4 filesystems using ext4dev,
+         chose Y here.   This feature will go away by 2.6.31, so
+         please arrange to get your userspace programs fixed!
+
+config EXT4_FS_XATTR
+       bool "Ext4 extended attributes"
+       depends on EXT4_FS

        default y
        help
          Extended attributes are name:value pairs associated with inodes by
        default y
        help
          Extended attributes are name:value pairs associated with inodes by


@@ -175,11 +189,11 @@ config EXT4DEV_FS_XATTR
 
          If unsure, say N.
 
 
          If unsure, say N.
 

-         You need this for POSIX ACL support on ext4dev/ext4.
+         You need this for POSIX ACL support on ext4.

 
 

-config EXT4DEV_FS_POSIX_ACL
-       bool "Ext4dev POSIX Access Control Lists"
-       depends on EXT4DEV_FS_XATTR
+config EXT4_FS_POSIX_ACL
+       bool "Ext4 POSIX Access Control Lists"
+       depends on EXT4_FS_XATTR

        select FS_POSIX_ACL
        help
          POSIX Access Control Lists (ACLs) support permissions for users and
        select FS_POSIX_ACL
        help
          POSIX Access Control Lists (ACLs) support permissions for users and


@@ -190,14 +204,14 @@ config EXT4DEV_FS_POSIX_ACL
 
          If you don't know what Access Control Lists are, say N
 
 
          If you don't know what Access Control Lists are, say N
 

-config EXT4DEV_FS_SECURITY
-       bool "Ext4dev Security Labels"
-       depends on EXT4DEV_FS_XATTR
+config EXT4_FS_SECURITY
+       bool "Ext4 Security Labels"
+       depends on EXT4_FS_XATTR

        help
          Security labels support alternative access control models
          implemented by security modules like SELinux.  This option
          enables an extended attribute handler for file security
        help
          Security labels support alternative access control models
          implemented by security modules like SELinux.  This option
          enables an extended attribute handler for file security

-         labels in the ext4dev/ext4 filesystem.
+         labels in the ext4 filesystem.

 
          If you are not using a security module that requires using
          extended attributes for file security labels, say N.
 
          If you are not using a security module that requires using
          extended attributes for file security labels, say N.


@@ -206,17 +220,16 @@ config JBD
        tristate
        help
          This is a generic journalling layer for block devices.  It is
        tristate
        help
          This is a generic journalling layer for block devices.  It is

-         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
+         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.
 
          devices such as RAID or LVM.
 

-         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.
+         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.

 
          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 or OCFS2 into the kernel,
-         you cannot compile this code as a module.
+         called jbd.  If you are compiling ext3 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"


@@ -240,22 +253,23 @@ config JBD2
        help
          This is a generic journaling layer for block devices that support
          both 32-bit and 64-bit block numbers.  It is currently used by
        help
          This is a generic journaling layer for block devices that support
          both 32-bit and 64-bit block numbers.  It is currently used by

-         the ext4dev/ext4 filesystem, but it could also be used to add
+         the ext4 and OCFS2 filesystems, but it could also be used to add

          journal support to other file systems or block devices such
          as RAID or LVM.
 
          journal support to other file systems or block devices such
          as RAID or LVM.
 

-         If you are using ext4dev/ext4, you need to say Y here. If you are not
-         using ext4dev/ext4 then you will probably want to say N.
+         If you are using ext4 or OCFS2, you need to say Y here.
+         If you are not using ext4 or 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 jbd2.  If you are compiling ext4dev/ext4 into the kernel,
+         called jbd2.  If you are compiling ext4 or OCFS2 into the kernel,

          you cannot compile this code as a module.
 
 config JBD2_DEBUG
          you cannot compile this code as a module.
 
 config JBD2_DEBUG

-       bool "JBD2 (ext4dev/ext4) debugging support"
+       bool "JBD2 (ext4) debugging support"

        depends on JBD2 && DEBUG_FS
        help
        depends on JBD2 && DEBUG_FS
        help

-         If you are using the ext4dev/ext4 journaled file system (or
+         If you are using the ext4 journaled file system (or

          potentially any other filesystem/device using JBD2), this option
          allows you to enable debugging output while the system is running,
          in order to help track down any problems you are having.
          potentially any other filesystem/device using JBD2), this option
          allows you to enable debugging output while the system is running,
          in order to help track down any problems you are having.


@@ -270,9 +284,9 @@ config JBD2_DEBUG
 config FS_MBCACHE
 # Meta block cache for Extended Attributes (ext2/ext3/ext4)
        tristate
 config FS_MBCACHE
 # Meta block cache for Extended Attributes (ext2/ext3/ext4)
        tristate

-       depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4DEV_FS_XATTR
-       default y if EXT2_FS=y || EXT3_FS=y || EXT4DEV_FS=y
-       default m if EXT2_FS=m || EXT3_FS=m || EXT4DEV_FS=m
+       depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR
+       default y if EXT2_FS=y || EXT3_FS=y || EXT4_FS=y
+       default m if EXT2_FS=m || EXT3_FS=m || EXT4_FS=m

 
 config REISERFS_FS
        tristate "Reiserfs support"
 
 config REISERFS_FS
        tristate "Reiserfs support"


@@ -419,6 +433,14 @@ config FS_POSIX_ACL
        bool
        default n
 
        bool
        default n
 

+config FILE_LOCKING
+       bool "Enable POSIX file locking API" if EMBEDDED
+       default y
+       help
+         This option enables standard file locking support, required
+          for filesystems like NFS and for the flock() system
+          call. Disabling this option saves about 11k.
+

 source "fs/xfs/Kconfig"
 source "fs/gfs2/Kconfig"
 
 source "fs/xfs/Kconfig"
 source "fs/gfs2/Kconfig"
 


@@ -426,7 +448,7 @@ config OCFS2_FS
        tristate "OCFS2 file system support"
        depends on NET && SYSFS
        select CONFIGFS_FS
        tristate "OCFS2 file system support"
        depends on NET && SYSFS
        select CONFIGFS_FS

-       select JBD
+       select JBD2

        select CRC32
        help
          OCFS2 is a general purpose extent based shared disk cluster file
        select CRC32
        help
          OCFS2 is a general purpose extent based shared disk cluster file


@@ -497,6 +519,16 @@ config OCFS2_DEBUG_FS
          this option for debugging only as it is likely to decrease
          performance of the filesystem.
 
          this option for debugging only as it is likely to decrease
          performance of the filesystem.
 

+config OCFS2_COMPAT_JBD
+       bool "Use JBD for compatibility"
+       depends on OCFS2_FS
+       default n
+       select JBD
+       help
+         The ocfs2 filesystem now uses JBD2 for its journalling.  JBD2
+         is backwards compatible with JBD.  It is safe to say N here.
+         However, if you really want to use the original JBD, say Y here.
+

 endif # BLOCK
 
 config DNOTIFY
 endif # BLOCK
 
 config DNOTIFY


@@ -1765,6 +1797,28 @@ config SUNRPC_XPRT_RDMA
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config SUNRPC_REGISTER_V4
+       bool "Register local RPC services via rpcbind v4 (EXPERIMENTAL)"
+       depends on SUNRPC && EXPERIMENTAL
+       default n
+       help
+         Sun added support for registering RPC services at an IPv6
+         address by creating two new versions of the rpcbind protocol
+         (RFC 1833).
+
+         This option enables support in the kernel RPC server for
+         registering kernel RPC services via version 4 of the rpcbind
+         protocol.  If you enable this option, you must run a portmapper
+         daemon that supports rpcbind protocol version 4.
+
+         Serving NFS over IPv6 from knfsd (the kernel's NFS server)
+         requires that you enable this option and use a portmapper that
+         supports rpcbind version 4.
+
+         If unsure, say N to get traditional behavior (register kernel
+         RPC services using only rpcbind version 2).  Distributions
+         using the legacy Linux portmapper daemon must say N here.
+

 config RPCSEC_GSS_KRB5
        tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
        depends on SUNRPC && EXPERIMENTAL
 config RPCSEC_GSS_KRB5
        tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
        depends on SUNRPC && EXPERIMENTAL