[XFS] kill parent == child checks in xfs_remove and xfs_rmdir

[linux-2.6] / fs / xfs / Kconfig

diff --git a/fs/xfs/Kconfig b/fs/xfs/Kconfig
index 236f9cf3714f0e46864eeef4116d59922617ad82..524021ff54367661322862d84272572171777755 100644 (file)
--- a/fs/xfs/Kconfig
+++ b/fs/xfs/Kconfig
@@ -1,6 +1,6 @@
 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
@@ -18,11 +18,6 @@ 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
-       depends on XFS_FS && EXPORTFS
-       default y
-
 config XFS_QUOTA
        bool "XFS Quota support"
        depends on XFS_FS
@@ -40,18 +35,6 @@ config XFS_QUOTA
          with or without the generic quota support enabled (CONFIG_QUOTA) -
          they are completely independent subsystems.
 
-config XFS_SECURITY
-       bool "XFS Security Label support"
-       depends on XFS_FS
-       help
-         Security labels support alternative access control models
-         implemented by security modules like SELinux.  This option
-         enables an extended attribute namespace for inode security
-         labels in the XFS filesystem.
-
-         If you are not using a security module that requires using
-         extended attributes for inode security labels, say N.
-
 config XFS_POSIX_ACL
        bool "XFS POSIX ACL support"
        depends on XFS_FS