diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
commit | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch) | |
tree | 03de82e812f00957aa6276dac2fe51c3358e88d7 /fs/Kconfig | |
parent | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff) | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
Diffstat (limited to 'fs/Kconfig')
-rw-r--r-- | fs/Kconfig | 137 |
1 files changed, 95 insertions, 42 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 522469a7eca3..51307b0fdf0f 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -189,6 +189,8 @@ config OCFS2_FS | |||
189 | select CONFIGFS_FS | 189 | select CONFIGFS_FS |
190 | select JBD2 | 190 | select JBD2 |
191 | select CRC32 | 191 | select CRC32 |
192 | select QUOTA | ||
193 | select QUOTA_TREE | ||
192 | help | 194 | help |
193 | OCFS2 is a general purpose extent based shared disk cluster file | 195 | OCFS2 is a general purpose extent based shared disk cluster file |
194 | system with many similarities to ext3. It supports 64 bit inode | 196 | system with many similarities to ext3. It supports 64 bit inode |
@@ -258,56 +260,37 @@ config OCFS2_DEBUG_FS | |||
258 | this option for debugging only as it is likely to decrease | 260 | this option for debugging only as it is likely to decrease |
259 | performance of the filesystem. | 261 | performance of the filesystem. |
260 | 262 | ||
261 | config OCFS2_COMPAT_JBD | 263 | config OCFS2_FS_POSIX_ACL |
262 | bool "Use JBD for compatibility" | 264 | bool "OCFS2 POSIX Access Control Lists" |
263 | depends on OCFS2_FS | 265 | depends on OCFS2_FS |
266 | select FS_POSIX_ACL | ||
264 | default n | 267 | default n |
265 | select JBD | ||
266 | help | 268 | help |
267 | The ocfs2 filesystem now uses JBD2 for its journalling. JBD2 | 269 | Posix Access Control Lists (ACLs) support permissions for users and |
268 | is backwards compatible with JBD. It is safe to say N here. | 270 | groups beyond the owner/group/world scheme. |
269 | However, if you really want to use the original JBD, say Y here. | ||
270 | |||
271 | endif # BLOCK | ||
272 | 271 | ||
273 | config DNOTIFY | 272 | config BTRFS_FS |
274 | bool "Dnotify support" | 273 | tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format" |
275 | default y | 274 | depends on EXPERIMENTAL |
275 | select LIBCRC32C | ||
276 | select ZLIB_INFLATE | ||
277 | select ZLIB_DEFLATE | ||
276 | help | 278 | help |
277 | Dnotify is a directory-based per-fd file change notification system | 279 | Btrfs is a new filesystem with extents, writable snapshotting, |
278 | that uses signals to communicate events to user-space. There exist | 280 | support for multiple devices and many more features. |
279 | superior alternatives, but some applications may still rely on | ||
280 | dnotify. | ||
281 | |||
282 | If unsure, say Y. | ||
283 | |||
284 | config INOTIFY | ||
285 | bool "Inotify file change notification support" | ||
286 | default y | ||
287 | ---help--- | ||
288 | Say Y here to enable inotify support. Inotify is a file change | ||
289 | notification system and a replacement for dnotify. Inotify fixes | ||
290 | numerous shortcomings in dnotify and introduces several new features | ||
291 | including multiple file events, one-shot support, and unmount | ||
292 | notification. | ||
293 | 281 | ||
294 | For more information, see <file:Documentation/filesystems/inotify.txt> | 282 | Btrfs is highly experimental, and THE DISK FORMAT IS NOT YET |
283 | FINALIZED. You should say N here unless you are interested in | ||
284 | testing Btrfs with non-critical data. | ||
295 | 285 | ||
296 | If unsure, say Y. | 286 | To compile this file system support as a module, choose M here. The |
287 | module will be called btrfs. | ||
297 | 288 | ||
298 | config INOTIFY_USER | 289 | If unsure, say N. |
299 | bool "Inotify support for userspace" | ||
300 | depends on INOTIFY | ||
301 | default y | ||
302 | ---help--- | ||
303 | Say Y here to enable inotify support for userspace, including the | ||
304 | associated system calls. Inotify allows monitoring of both files and | ||
305 | directories via a single open fd. Events are read from the file | ||
306 | descriptor, which is also select()- and poll()-able. | ||
307 | 290 | ||
308 | For more information, see <file:Documentation/filesystems/inotify.txt> | 291 | endif # BLOCK |
309 | 292 | ||
310 | If unsure, say Y. | 293 | source "fs/notify/Kconfig" |
311 | 294 | ||
312 | config QUOTA | 295 | config QUOTA |
313 | bool "Quota support" | 296 | bool "Quota support" |
@@ -340,6 +323,10 @@ config PRINT_QUOTA_WARNING | |||
340 | Note that this behavior is currently deprecated and may go away in | 323 | Note that this behavior is currently deprecated and may go away in |
341 | future. Please use notification via netlink socket instead. | 324 | future. Please use notification via netlink socket instead. |
342 | 325 | ||
326 | # Generic support for tree structured quota files. Seleted when needed. | ||
327 | config QUOTA_TREE | ||
328 | tristate | ||
329 | |||
343 | config QFMT_V1 | 330 | config QFMT_V1 |
344 | tristate "Old quota format support" | 331 | tristate "Old quota format support" |
345 | depends on QUOTA | 332 | depends on QUOTA |
@@ -351,6 +338,7 @@ config QFMT_V1 | |||
351 | config QFMT_V2 | 338 | config QFMT_V2 |
352 | tristate "Quota format v2 support" | 339 | tristate "Quota format v2 support" |
353 | depends on QUOTA | 340 | depends on QUOTA |
341 | select QUOTA_TREE | ||
354 | help | 342 | help |
355 | This quota format allows using quotas with 32-bit UIDs/GIDs. If you | 343 | This quota format allows using quotas with 32-bit UIDs/GIDs. If you |
356 | need this functionality say Y here. | 344 | need this functionality say Y here. |
@@ -752,7 +740,20 @@ config CONFIGFS_FS | |||
752 | 740 | ||
753 | endmenu | 741 | endmenu |
754 | 742 | ||
755 | menu "Miscellaneous filesystems" | 743 | menuconfig MISC_FILESYSTEMS |
744 | bool "Miscellaneous filesystems" | ||
745 | default y | ||
746 | ---help--- | ||
747 | Say Y here to get to see options for various miscellaneous | ||
748 | filesystems, such as filesystems that came from other | ||
749 | operating systems. | ||
750 | |||
751 | This option alone does not add any kernel code. | ||
752 | |||
753 | If you say N, all options in this submenu will be skipped and | ||
754 | disabled; if unsure, say Y here. | ||
755 | |||
756 | if MISC_FILESYSTEMS | ||
756 | 757 | ||
757 | config ADFS_FS | 758 | config ADFS_FS |
758 | tristate "ADFS file system support (EXPERIMENTAL)" | 759 | tristate "ADFS file system support (EXPERIMENTAL)" |
@@ -931,6 +932,58 @@ config CRAMFS | |||
931 | 932 | ||
932 | If unsure, say N. | 933 | If unsure, say N. |
933 | 934 | ||
935 | config SQUASHFS | ||
936 | tristate "SquashFS 4.0 - Squashed file system support" | ||
937 | depends on BLOCK | ||
938 | select ZLIB_INFLATE | ||
939 | help | ||
940 | Saying Y here includes support for SquashFS 4.0 (a Compressed | ||
941 | Read-Only File System). Squashfs is a highly compressed read-only | ||
942 | filesystem for Linux. It uses zlib compression to compress both | ||
943 | files, inodes and directories. Inodes in the system are very small | ||
944 | and all blocks are packed to minimise data overhead. Block sizes | ||
945 | greater than 4K are supported up to a maximum of 1 Mbytes (default | ||
946 | block size 128K). SquashFS 4.0 supports 64 bit filesystems and files | ||
947 | (larger than 4GB), full uid/gid information, hard links and | ||
948 | timestamps. | ||
949 | |||
950 | Squashfs is intended for general read-only filesystem use, for | ||
951 | archival use (i.e. in cases where a .tar.gz file may be used), and in | ||
952 | embedded systems where low overhead is needed. Further information | ||
953 | and tools are available from http://squashfs.sourceforge.net. | ||
954 | |||
955 | If you want to compile this as a module ( = code which can be | ||
956 | inserted in and removed from the running kernel whenever you want), | ||
957 | say M here and read <file:Documentation/modules.txt>. The module | ||
958 | will be called squashfs. Note that the root file system (the one | ||
959 | containing the directory /) cannot be compiled as a module. | ||
960 | |||
961 | If unsure, say N. | ||
962 | |||
963 | config SQUASHFS_EMBEDDED | ||
964 | |||
965 | bool "Additional option for memory-constrained systems" | ||
966 | depends on SQUASHFS | ||
967 | default n | ||
968 | help | ||
969 | Saying Y here allows you to specify cache size. | ||
970 | |||
971 | If unsure, say N. | ||
972 | |||
973 | config SQUASHFS_FRAGMENT_CACHE_SIZE | ||
974 | int "Number of fragments cached" if SQUASHFS_EMBEDDED | ||
975 | depends on SQUASHFS | ||
976 | default "3" | ||
977 | help | ||
978 | By default SquashFS caches the last 3 fragments read from | ||
979 | the filesystem. Increasing this amount may mean SquashFS | ||
980 | has to re-read fragments less often from disk, at the expense | ||
981 | of extra system memory. Decreasing this amount will mean | ||
982 | SquashFS uses less memory at the expense of extra reads from disk. | ||
983 | |||
984 | Note there must be at least one cached fragment. Anything | ||
985 | much more than three will probably not make much difference. | ||
986 | |||
934 | config VXFS_FS | 987 | config VXFS_FS |
935 | tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" | 988 | tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" |
936 | depends on BLOCK | 989 | depends on BLOCK |
@@ -1122,7 +1175,7 @@ config UFS_DEBUG | |||
1122 | Y here. This will result in _many_ additional debugging messages to be | 1175 | Y here. This will result in _many_ additional debugging messages to be |
1123 | written to the system log. | 1176 | written to the system log. |
1124 | 1177 | ||
1125 | endmenu | 1178 | endif # MISC_FILESYSTEMS |
1126 | 1179 | ||
1127 | menuconfig NETWORK_FILESYSTEMS | 1180 | menuconfig NETWORK_FILESYSTEMS |
1128 | bool "Network File Systems" | 1181 | bool "Network File Systems" |