[JFFS2] Fix jffs2_follow_link() typo

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

diff --git a/fs/xfs/Kconfig b/fs/xfs/Kconfig
index c92306f0fdc578e4f4e125acc1fa77b6e13ccb0d..35115bca036e01d5363c6103100a875c232784e0 100644 (file)
--- a/fs/xfs/Kconfig
+++ b/fs/xfs/Kconfig
@@ -1,8 +1,6 @@
-menu "XFS support"
-
 config XFS_FS
        tristate "XFS filesystem support"
-       select EXPORTFS if NFSD!=n
+       depends on BLOCK
        help
          XFS is a high performance journaling filesystem which originated
          on the SGI IRIX platform.  It is completely multi-threaded, can
@@ -20,29 +18,8 @@ config XFS_FS
          system of your root partition is compiled as a module, you'll need
          to use an initial ramdisk (initrd) to boot.
 
-config XFS_EXPORT
-       bool
-       default y if XFS_FS && EXPORTFS
-
-config XFS_RT
-       bool "Realtime support (EXPERIMENTAL)"
-       depends on XFS_FS && EXPERIMENTAL
-       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
-         separate area of disk space where only file data is stored. The
-         realtime subvolume is designed to provide very deterministic
-         data rates suitable for media streaming applications.
-
-         See the xfs man page in section 5 for a bit more information.
-
-         This feature is unsupported at this time, is not yet fully
-         functional, and may cause serious problems.
-
-         If unsure, say N.
-
 config XFS_QUOTA
-       bool "Quota support"
+       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
@@ -59,7 +36,7 @@ config XFS_QUOTA
          they are completely independent subsystems.
 
 config XFS_SECURITY
-       bool "Security Label support"
+       bool "XFS Security Label support"
        depends on XFS_FS
        help
          Security labels support alternative access control models
@@ -71,7 +48,7 @@ config XFS_SECURITY
          extended attributes for inode security labels, say N.
 
 config XFS_POSIX_ACL
-       bool "POSIX ACL support"
+       bool "XFS POSIX ACL support"
        depends on XFS_FS
        help
          POSIX Access Control Lists (ACLs) support permissions for users and
@@ -82,4 +59,20 @@ config XFS_POSIX_ACL
 
          If you don't know what Access Control Lists are, say N.
 
-endmenu
+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
+         separate area of disk space where only file data is stored.  It was
+         originally designed to provide deterministic data rates suitable
+         for media streaming applications, but is also useful as a generic
+         mechanism for ensuring data and metadata/log I/Os are completely
+         separated.  Regular file I/Os are isolated to a separate device
+         from all other requests, and this can be done quite transparently
+         to applications via the inherit-realtime directory inode flag.
+
+         See the xfs man page in section 5 for additional information.
+
+         If unsure, say N.