aboutsummaryrefslogtreecommitdiffstats
path: root/fs/Kconfig
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-10-02 08:45:08 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-10-02 08:45:08 -0400
commit59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch)
treef1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /fs/Kconfig
parent825f9075d74028d11d7f5932f04e1b5db3022b51 (diff)
parentd834c16516d1ebec4766fc58c059bf01311e6045 (diff)
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/Kconfig')
-rw-r--r--fs/Kconfig48
1 files changed, 41 insertions, 7 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index c968b9c7e581..fa64867d6ed6 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -4,6 +4,8 @@
4 4
5menu "File systems" 5menu "File systems"
6 6
7if BLOCK
8
7config EXT2_FS 9config EXT2_FS
8 tristate "Second extended fs support" 10 tristate "Second extended fs support"
9 help 11 help
@@ -400,6 +402,8 @@ config ROMFS_FS
400 If you don't know whether you need it, then you don't need it: 402 If you don't know whether you need it, then you don't need it:
401 answer N. 403 answer N.
402 404
405endif
406
403config INOTIFY 407config INOTIFY
404 bool "Inotify file change notification support" 408 bool "Inotify file change notification support"
405 default y 409 default y
@@ -531,6 +535,7 @@ config FUSE_FS
531 If you want to develop a userspace FS, or if you want to use 535 If you want to develop a userspace FS, or if you want to use
532 a filesystem based on FUSE, answer Y or M. 536 a filesystem based on FUSE, answer Y or M.
533 537
538if BLOCK
534menu "CD-ROM/DVD Filesystems" 539menu "CD-ROM/DVD Filesystems"
535 540
536config ISO9660_FS 541config ISO9660_FS
@@ -598,7 +603,9 @@ config UDF_NLS
598 depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y) 603 depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y)
599 604
600endmenu 605endmenu
606endif
601 607
608if BLOCK
602menu "DOS/FAT/NT Filesystems" 609menu "DOS/FAT/NT Filesystems"
603 610
604config FAT_FS 611config FAT_FS
@@ -783,6 +790,7 @@ config NTFS_RW
783 It is perfectly safe to say N here. 790 It is perfectly safe to say N here.
784 791
785endmenu 792endmenu
793endif
786 794
787menu "Pseudo filesystems" 795menu "Pseudo filesystems"
788 796
@@ -882,6 +890,19 @@ config TMPFS
882 890
883 See <file:Documentation/filesystems/tmpfs.txt> for details. 891 See <file:Documentation/filesystems/tmpfs.txt> for details.
884 892
893config TMPFS_POSIX_ACL
894 bool "Tmpfs POSIX Access Control Lists"
895 depends on TMPFS
896 select GENERIC_ACL
897 help
898 POSIX Access Control Lists (ACLs) support permissions for users and
899 groups beyond the owner/group/world scheme.
900
901 To learn more about Access Control Lists, visit the POSIX ACLs for
902 Linux website <http://acl.bestbits.at/>.
903
904 If you don't know what Access Control Lists are, say N.
905
885config HUGETLBFS 906config HUGETLBFS
886 bool "HugeTLB file system support" 907 bool "HugeTLB file system support"
887 depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN 908 depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
@@ -927,7 +948,7 @@ menu "Miscellaneous filesystems"
927 948
928config ADFS_FS 949config ADFS_FS
929 tristate "ADFS file system support (EXPERIMENTAL)" 950 tristate "ADFS file system support (EXPERIMENTAL)"
930 depends on EXPERIMENTAL 951 depends on BLOCK && EXPERIMENTAL
931 help 952 help
932 The Acorn Disc Filing System is the standard file system of the 953 The Acorn Disc Filing System is the standard file system of the
933 RiscOS operating system which runs on Acorn's ARM-based Risc PC 954 RiscOS operating system which runs on Acorn's ARM-based Risc PC
@@ -955,7 +976,7 @@ config ADFS_FS_RW
955 976
956config AFFS_FS 977config AFFS_FS
957 tristate "Amiga FFS file system support (EXPERIMENTAL)" 978 tristate "Amiga FFS file system support (EXPERIMENTAL)"
958 depends on EXPERIMENTAL 979 depends on BLOCK && EXPERIMENTAL
959 help 980 help
960 The Fast File System (FFS) is the common file system used on hard 981 The Fast File System (FFS) is the common file system used on hard
961 disks by Amiga(tm) systems since AmigaOS Version 1.3 (34.20). Say Y 982 disks by Amiga(tm) systems since AmigaOS Version 1.3 (34.20). Say Y
@@ -977,7 +998,7 @@ config AFFS_FS
977 998
978config HFS_FS 999config HFS_FS
979 tristate "Apple Macintosh file system support (EXPERIMENTAL)" 1000 tristate "Apple Macintosh file system support (EXPERIMENTAL)"
980 depends on EXPERIMENTAL 1001 depends on BLOCK && EXPERIMENTAL
981 select NLS 1002 select NLS
982 help 1003 help
983 If you say Y here, you will be able to mount Macintosh-formatted 1004 If you say Y here, you will be able to mount Macintosh-formatted
@@ -990,6 +1011,7 @@ config HFS_FS
990 1011
991config HFSPLUS_FS 1012config HFSPLUS_FS
992 tristate "Apple Extended HFS file system support" 1013 tristate "Apple Extended HFS file system support"
1014 depends on BLOCK
993 select NLS 1015 select NLS
994 select NLS_UTF8 1016 select NLS_UTF8
995 help 1017 help
@@ -1003,7 +1025,7 @@ config HFSPLUS_FS
1003 1025
1004config BEFS_FS 1026config BEFS_FS
1005 tristate "BeOS file system (BeFS) support (read only) (EXPERIMENTAL)" 1027 tristate "BeOS file system (BeFS) support (read only) (EXPERIMENTAL)"
1006 depends on EXPERIMENTAL 1028 depends on BLOCK && EXPERIMENTAL
1007 select NLS 1029 select NLS
1008 help 1030 help
1009 The BeOS File System (BeFS) is the native file system of Be, Inc's 1031 The BeOS File System (BeFS) is the native file system of Be, Inc's
@@ -1030,7 +1052,7 @@ config BEFS_DEBUG
1030 1052
1031config BFS_FS 1053config BFS_FS
1032 tristate "BFS file system support (EXPERIMENTAL)" 1054 tristate "BFS file system support (EXPERIMENTAL)"
1033 depends on EXPERIMENTAL 1055 depends on BLOCK && EXPERIMENTAL
1034 help 1056 help
1035 Boot File System (BFS) is a file system used under SCO UnixWare to 1057 Boot File System (BFS) is a file system used under SCO UnixWare to
1036 allow the bootloader access to the kernel image and other important 1058 allow the bootloader access to the kernel image and other important
@@ -1052,7 +1074,7 @@ config BFS_FS
1052 1074
1053config EFS_FS 1075config EFS_FS
1054 tristate "EFS file system support (read only) (EXPERIMENTAL)" 1076 tristate "EFS file system support (read only) (EXPERIMENTAL)"
1055 depends on EXPERIMENTAL 1077 depends on BLOCK && EXPERIMENTAL
1056 help 1078 help
1057 EFS is an older file system used for non-ISO9660 CD-ROMs and hard 1079 EFS is an older file system used for non-ISO9660 CD-ROMs and hard
1058 disk partitions by SGI's IRIX operating system (IRIX 6.0 and newer 1080 disk partitions by SGI's IRIX operating system (IRIX 6.0 and newer
@@ -1067,7 +1089,7 @@ config EFS_FS
1067 1089
1068config JFFS_FS 1090config JFFS_FS
1069 tristate "Journalling Flash File System (JFFS) support" 1091 tristate "Journalling Flash File System (JFFS) support"
1070 depends on MTD 1092 depends on MTD && BLOCK
1071 help 1093 help
1072 JFFS is the Journaling Flash File System developed by Axis 1094 JFFS is the Journaling Flash File System developed by Axis
1073 Communications in Sweden, aimed at providing a crash/powerdown-safe 1095 Communications in Sweden, aimed at providing a crash/powerdown-safe
@@ -1252,6 +1274,7 @@ endchoice
1252 1274
1253config CRAMFS 1275config CRAMFS
1254 tristate "Compressed ROM file system support (cramfs)" 1276 tristate "Compressed ROM file system support (cramfs)"
1277 depends on BLOCK
1255 select ZLIB_INFLATE 1278 select ZLIB_INFLATE
1256 help 1279 help
1257 Saying Y here includes support for CramFs (Compressed ROM File 1280 Saying Y here includes support for CramFs (Compressed ROM File
@@ -1271,6 +1294,7 @@ config CRAMFS
1271 1294
1272config VXFS_FS 1295config VXFS_FS
1273 tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" 1296 tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
1297 depends on BLOCK
1274 help 1298 help
1275 FreeVxFS is a file system driver that support the VERITAS VxFS(TM) 1299 FreeVxFS is a file system driver that support the VERITAS VxFS(TM)
1276 file system format. VERITAS VxFS(TM) is the standard file system 1300 file system format. VERITAS VxFS(TM) is the standard file system
@@ -1288,6 +1312,7 @@ config VXFS_FS
1288 1312
1289config HPFS_FS 1313config HPFS_FS
1290 tristate "OS/2 HPFS file system support" 1314 tristate "OS/2 HPFS file system support"
1315 depends on BLOCK
1291 help 1316 help
1292 OS/2 is IBM's operating system for PC's, the same as Warp, and HPFS 1317 OS/2 is IBM's operating system for PC's, the same as Warp, and HPFS
1293 is the file system used for organizing files on OS/2 hard disk 1318 is the file system used for organizing files on OS/2 hard disk
@@ -1304,6 +1329,7 @@ config HPFS_FS
1304 1329
1305config QNX4FS_FS 1330config QNX4FS_FS
1306 tristate "QNX4 file system support (read only)" 1331 tristate "QNX4 file system support (read only)"
1332 depends on BLOCK
1307 help 1333 help
1308 This is the file system used by the real-time operating systems 1334 This is the file system used by the real-time operating systems
1309 QNX 4 and QNX 6 (the latter is also called QNX RTP). 1335 QNX 4 and QNX 6 (the latter is also called QNX RTP).
@@ -1331,6 +1357,7 @@ config QNX4FS_RW
1331 1357
1332config SYSV_FS 1358config SYSV_FS
1333 tristate "System V/Xenix/V7/Coherent file system support" 1359 tristate "System V/Xenix/V7/Coherent file system support"
1360 depends on BLOCK
1334 help 1361 help
1335 SCO, Xenix and Coherent are commercial Unix systems for Intel 1362 SCO, Xenix and Coherent are commercial Unix systems for Intel
1336 machines, and Version 7 was used on the DEC PDP-11. Saying Y 1363 machines, and Version 7 was used on the DEC PDP-11. Saying Y
@@ -1369,6 +1396,7 @@ config SYSV_FS
1369 1396
1370config UFS_FS 1397config UFS_FS
1371 tristate "UFS file system support (read only)" 1398 tristate "UFS file system support (read only)"
1399 depends on BLOCK
1372 help 1400 help
1373 BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD, 1401 BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD,
1374 OpenBSD and NeXTstep) use a file system called UFS. Some System V 1402 OpenBSD and NeXTstep) use a file system called UFS. Some System V
@@ -1941,13 +1969,19 @@ config 9P_FS
1941 1969
1942 If unsure, say N. 1970 If unsure, say N.
1943 1971
1972config GENERIC_ACL
1973 bool
1974 select FS_POSIX_ACL
1975
1944endmenu 1976endmenu
1945 1977
1978if BLOCK
1946menu "Partition Types" 1979menu "Partition Types"
1947 1980
1948source "fs/partitions/Kconfig" 1981source "fs/partitions/Kconfig"
1949 1982
1950endmenu 1983endmenu
1984endif
1951 1985
1952source "fs/nls/Kconfig" 1986source "fs/nls/Kconfig"
1953source "fs/dlm/Kconfig" 1987source "fs/dlm/Kconfig"