jbd: improve fsync batching

[pandora-kernel.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 522469a..3288358 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -189,6 +189,8 @@ config OCFS2_FS
        select CONFIGFS_FS
        select JBD2
        select CRC32
        select CONFIGFS_FS
        select JBD2
        select CRC32

+       select QUOTA
+       select QUOTA_TREE

        help
          OCFS2 is a general purpose extent based shared disk cluster file
          system with many similarities to ext3. It supports 64 bit inode
        help
          OCFS2 is a general purpose extent based shared disk cluster file
          system with many similarities to ext3. It supports 64 bit inode


@@ -258,56 +260,18 @@ 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"
+config OCFS2_FS_POSIX_ACL
+       bool "OCFS2 POSIX Access Control Lists"

        depends on OCFS2_FS
        depends on OCFS2_FS

+       select FS_POSIX_ACL

        default n
        default n

-       select JBD

        help
        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.
+         Posix Access Control Lists (ACLs) support permissions for users and
+         groups beyond the owner/group/world scheme.

 
 endif # BLOCK
 
 
 endif # BLOCK
 

-config DNOTIFY
-       bool "Dnotify support"
-       default y
-       help
-         Dnotify is a directory-based per-fd file change notification system
-         that uses signals to communicate events to user-space.  There exist
-         superior alternatives, but some applications may still rely on
-         dnotify.
-
-         If unsure, say Y.
-
-config INOTIFY
-       bool "Inotify file change notification support"
-       default y
-       ---help---
-         Say Y here to enable inotify support.  Inotify is a file change
-         notification system and a replacement for dnotify.  Inotify fixes
-         numerous shortcomings in dnotify and introduces several new features
-         including multiple file events, one-shot support, and unmount
-         notification.
-
-         For more information, see <file:Documentation/filesystems/inotify.txt>
-
-         If unsure, say Y.
-
-config INOTIFY_USER
-       bool "Inotify support for userspace"
-       depends on INOTIFY
-       default y
-       ---help---
-         Say Y here to enable inotify support for userspace, including the
-         associated system calls.  Inotify allows monitoring of both files and
-         directories via a single open fd.  Events are read from the file
-         descriptor, which is also select()- and poll()-able.
-
-         For more information, see <file:Documentation/filesystems/inotify.txt>
-
-         If unsure, say Y.
+source "fs/notify/Kconfig"

 
 config QUOTA
        bool "Quota support"
 
 config QUOTA
        bool "Quota support"


@@ -340,6 +304,10 @@ config PRINT_QUOTA_WARNING
          Note that this behavior is currently deprecated and may go away in
          future. Please use notification via netlink socket instead.
 
          Note that this behavior is currently deprecated and may go away in
          future. Please use notification via netlink socket instead.
 

+# Generic support for tree structured quota files. Seleted when needed.
+config QUOTA_TREE
+        tristate
+

 config QFMT_V1
        tristate "Old quota format support"
        depends on QUOTA
 config QFMT_V1
        tristate "Old quota format support"
        depends on QUOTA


@@ -351,6 +319,7 @@ config QFMT_V1
 config QFMT_V2
        tristate "Quota format v2 support"
        depends on QUOTA
 config QFMT_V2
        tristate "Quota format v2 support"
        depends on QUOTA

+       select QUOTA_TREE

        help
          This quota format allows using quotas with 32-bit UIDs/GIDs. If you
          need this functionality say Y here.
        help
          This quota format allows using quotas with 32-bit UIDs/GIDs. If you
          need this functionality say Y here.


@@ -752,7 +721,20 @@ config CONFIGFS_FS
 
 endmenu
 
 
 endmenu
 

-menu "Miscellaneous filesystems"
+menuconfig MISC_FILESYSTEMS
+       bool "Miscellaneous filesystems"
+       default y
+       ---help---
+         Say Y here to get to see options for various miscellaneous
+         filesystems, such as filesystems that came from other
+         operating systems.
+
+         This option alone does not add any kernel code.
+
+         If you say N, all options in this submenu will be skipped and
+         disabled; if unsure, say Y here.
+
+if MISC_FILESYSTEMS

 
 config ADFS_FS
        tristate "ADFS file system support (EXPERIMENTAL)"
 
 config ADFS_FS
        tristate "ADFS file system support (EXPERIMENTAL)"


@@ -1122,7 +1104,7 @@ config UFS_DEBUG
          Y here.  This will result in _many_ additional debugging messages to be
          written to the system log.
 
          Y here.  This will result in _many_ additional debugging messages to be
          written to the system log.
 

-endmenu
+endif # MISC_FILESYSTEMS

 
 menuconfig NETWORK_FILESYSTEMS
        bool "Network File Systems"
 
 menuconfig NETWORK_FILESYSTEMS
        bool "Network File Systems"