Merge branch 'master' into gfs2

[pandora-kernel.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index c968b9c..fa64867 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -4,6 +4,8 @@
 
 menu "File systems"
 
 
 menu "File systems"
 

+if BLOCK
+

 config EXT2_FS
        tristate "Second extended fs support"
        help
 config EXT2_FS
        tristate "Second extended fs support"
        help


@@ -400,6 +402,8 @@ config ROMFS_FS
          If you don't know whether you need it, then you don't need it:
          answer N.
 
          If you don't know whether you need it, then you don't need it:
          answer N.
 

+endif
+

 config INOTIFY
        bool "Inotify file change notification support"
        default y
 config INOTIFY
        bool "Inotify file change notification support"
        default y


@@ -531,6 +535,7 @@ config FUSE_FS
          If you want to develop a userspace FS, or if you want to use
          a filesystem based on FUSE, answer Y or M.
 
          If you want to develop a userspace FS, or if you want to use
          a filesystem based on FUSE, answer Y or M.
 

+if BLOCK

 menu "CD-ROM/DVD Filesystems"
 
 config ISO9660_FS
 menu "CD-ROM/DVD Filesystems"
 
 config ISO9660_FS


@@ -598,7 +603,9 @@ config UDF_NLS
        depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y)
 
 endmenu
        depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y)
 
 endmenu

+endif

 
 

+if BLOCK

 menu "DOS/FAT/NT Filesystems"
 
 config FAT_FS
 menu "DOS/FAT/NT Filesystems"
 
 config FAT_FS


@@ -783,6 +790,7 @@ config NTFS_RW
          It is perfectly safe to say N here.
 
 endmenu
          It is perfectly safe to say N here.
 
 endmenu

+endif

 
 menu "Pseudo filesystems"
 
 
 menu "Pseudo filesystems"
 


@@ -882,6 +890,19 @@ config TMPFS
 
          See <file:Documentation/filesystems/tmpfs.txt> for details.
 
 
          See <file:Documentation/filesystems/tmpfs.txt> for details.
 

+config TMPFS_POSIX_ACL
+       bool "Tmpfs POSIX Access Control Lists"
+       depends on TMPFS
+       select GENERIC_ACL
+       help
+         POSIX Access Control Lists (ACLs) support permissions for users and
+         groups beyond the owner/group/world scheme.
+
+         To learn more about Access Control Lists, visit the POSIX ACLs for
+         Linux website <http://acl.bestbits.at/>.
+
+         If you don't know what Access Control Lists are, say N.
+

 config HUGETLBFS
        bool "HugeTLB file system support"
        depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
 config HUGETLBFS
        bool "HugeTLB file system support"
        depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN


@@ -927,7 +948,7 @@ menu "Miscellaneous filesystems"
 
 config ADFS_FS
        tristate "ADFS file system support (EXPERIMENTAL)"
 
 config ADFS_FS
        tristate "ADFS file system support (EXPERIMENTAL)"

-       depends on EXPERIMENTAL
+       depends on BLOCK && EXPERIMENTAL

        help
          The Acorn Disc Filing System is the standard file system of the
          RiscOS operating system which runs on Acorn's ARM-based Risc PC
        help
          The Acorn Disc Filing System is the standard file system of the
          RiscOS operating system which runs on Acorn's ARM-based Risc PC


@@ -955,7 +976,7 @@ config ADFS_FS_RW
 
 config AFFS_FS
        tristate "Amiga FFS file system support (EXPERIMENTAL)"
 
 config AFFS_FS
        tristate "Amiga FFS file system support (EXPERIMENTAL)"

-       depends on EXPERIMENTAL
+       depends on BLOCK && EXPERIMENTAL

        help
          The Fast File System (FFS) is the common file system used on hard
          disks by Amiga(tm) systems since AmigaOS Version 1.3 (34.20).  Say Y
        help
          The Fast File System (FFS) is the common file system used on hard
          disks by Amiga(tm) systems since AmigaOS Version 1.3 (34.20).  Say Y


@@ -977,7 +998,7 @@ config AFFS_FS
 
 config HFS_FS
        tristate "Apple Macintosh file system support (EXPERIMENTAL)"
 
 config HFS_FS
        tristate "Apple Macintosh file system support (EXPERIMENTAL)"

-       depends on EXPERIMENTAL
+       depends on BLOCK && EXPERIMENTAL

        select NLS
        help
          If you say Y here, you will be able to mount Macintosh-formatted
        select NLS
        help
          If you say Y here, you will be able to mount Macintosh-formatted


@@ -990,6 +1011,7 @@ config HFS_FS
 
 config HFSPLUS_FS
        tristate "Apple Extended HFS file system support"
 
 config HFSPLUS_FS
        tristate "Apple Extended HFS file system support"

+       depends on BLOCK

        select NLS
        select NLS_UTF8
        help
        select NLS
        select NLS_UTF8
        help


@@ -1003,7 +1025,7 @@ config HFSPLUS_FS
 
 config BEFS_FS
        tristate "BeOS file system (BeFS) support (read only) (EXPERIMENTAL)"
 
 config BEFS_FS
        tristate "BeOS file system (BeFS) support (read only) (EXPERIMENTAL)"

-       depends on EXPERIMENTAL
+       depends on BLOCK && EXPERIMENTAL

        select NLS
        help
          The BeOS File System (BeFS) is the native file system of Be, Inc's
        select NLS
        help
          The BeOS File System (BeFS) is the native file system of Be, Inc's


@@ -1030,7 +1052,7 @@ config BEFS_DEBUG
 
 config BFS_FS
        tristate "BFS file system support (EXPERIMENTAL)"
 
 config BFS_FS
        tristate "BFS file system support (EXPERIMENTAL)"

-       depends on EXPERIMENTAL
+       depends on BLOCK && EXPERIMENTAL

        help
          Boot File System (BFS) is a file system used under SCO UnixWare to
          allow the bootloader access to the kernel image and other important
        help
          Boot File System (BFS) is a file system used under SCO UnixWare to
          allow the bootloader access to the kernel image and other important


@@ -1052,7 +1074,7 @@ config BFS_FS
 
 config EFS_FS
        tristate "EFS file system support (read only) (EXPERIMENTAL)"
 
 config EFS_FS
        tristate "EFS file system support (read only) (EXPERIMENTAL)"

-       depends on EXPERIMENTAL
+       depends on BLOCK && EXPERIMENTAL

        help
          EFS is an older file system used for non-ISO9660 CD-ROMs and hard
          disk partitions by SGI's IRIX operating system (IRIX 6.0 and newer
        help
          EFS is an older file system used for non-ISO9660 CD-ROMs and hard
          disk partitions by SGI's IRIX operating system (IRIX 6.0 and newer


@@ -1067,7 +1089,7 @@ config EFS_FS
 
 config JFFS_FS
        tristate "Journalling Flash File System (JFFS) support"
 
 config JFFS_FS
        tristate "Journalling Flash File System (JFFS) support"

-       depends on MTD
+       depends on MTD && BLOCK

        help
          JFFS is the Journaling Flash File System developed by Axis
          Communications in Sweden, aimed at providing a crash/powerdown-safe
        help
          JFFS is the Journaling Flash File System developed by Axis
          Communications in Sweden, aimed at providing a crash/powerdown-safe


@@ -1252,6 +1274,7 @@ endchoice
 
 config CRAMFS
        tristate "Compressed ROM file system support (cramfs)"
 
 config CRAMFS
        tristate "Compressed ROM file system support (cramfs)"

+       depends on BLOCK

        select ZLIB_INFLATE
        help
          Saying Y here includes support for CramFs (Compressed ROM File
        select ZLIB_INFLATE
        help
          Saying Y here includes support for CramFs (Compressed ROM File


@@ -1271,6 +1294,7 @@ config CRAMFS
 
 config VXFS_FS
        tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
 
 config VXFS_FS
        tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"

+       depends on BLOCK

        help
          FreeVxFS is a file system driver that support the VERITAS VxFS(TM)
          file system format.  VERITAS VxFS(TM) is the standard file system
        help
          FreeVxFS is a file system driver that support the VERITAS VxFS(TM)
          file system format.  VERITAS VxFS(TM) is the standard file system


@@ -1288,6 +1312,7 @@ config VXFS_FS
 
 config HPFS_FS
        tristate "OS/2 HPFS file system support"
 
 config HPFS_FS
        tristate "OS/2 HPFS file system support"

+       depends on BLOCK

        help
          OS/2 is IBM's operating system for PC's, the same as Warp, and HPFS
          is the file system used for organizing files on OS/2 hard disk
        help
          OS/2 is IBM's operating system for PC's, the same as Warp, and HPFS
          is the file system used for organizing files on OS/2 hard disk


@@ -1304,6 +1329,7 @@ config HPFS_FS
 
 config QNX4FS_FS
        tristate "QNX4 file system support (read only)"
 
 config QNX4FS_FS
        tristate "QNX4 file system support (read only)"

+       depends on BLOCK

        help
          This is the file system used by the real-time operating systems
          QNX 4 and QNX 6 (the latter is also called QNX RTP).
        help
          This is the file system used by the real-time operating systems
          QNX 4 and QNX 6 (the latter is also called QNX RTP).


@@ -1331,6 +1357,7 @@ config QNX4FS_RW
 
 config SYSV_FS
        tristate "System V/Xenix/V7/Coherent file system support"
 
 config SYSV_FS
        tristate "System V/Xenix/V7/Coherent file system support"

+       depends on BLOCK

        help
          SCO, Xenix and Coherent are commercial Unix systems for Intel
          machines, and Version 7 was used on the DEC PDP-11. Saying Y
        help
          SCO, Xenix and Coherent are commercial Unix systems for Intel
          machines, and Version 7 was used on the DEC PDP-11. Saying Y


@@ -1369,6 +1396,7 @@ config SYSV_FS
 
 config UFS_FS
        tristate "UFS file system support (read only)"
 
 config UFS_FS
        tristate "UFS file system support (read only)"

+       depends on BLOCK

        help
          BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD,
          OpenBSD and NeXTstep) use a file system called UFS. Some System V
        help
          BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD,
          OpenBSD and NeXTstep) use a file system called UFS. Some System V


@@ -1941,13 +1969,19 @@ config 9P_FS
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config GENERIC_ACL
+       bool
+       select FS_POSIX_ACL
+

 endmenu
 
 endmenu
 

+if BLOCK

 menu "Partition Types"
 
 source "fs/partitions/Kconfig"
 
 endmenu
 menu "Partition Types"
 
 source "fs/partitions/Kconfig"
 
 endmenu

+endif

 
 source "fs/nls/Kconfig"
 source "fs/dlm/Kconfig"
 
 source "fs/nls/Kconfig"
 source "fs/dlm/Kconfig"