diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 13:01:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 13:01:38 -0800 |
| commit | 73d59314e6ed268d6f322ae1bdd723b23fa5a4ed (patch) | |
| tree | ec7159b13dfd57739ed840e88a436d8d6f4eee5f /fs/Kconfig | |
| parent | 6ddaab20c32af03d68de00e7c97ae8d9820e4dab (diff) | |
| parent | e293e97e363e419d8a3628a927321e3f75206a0b (diff) | |
| download | linux-3.10-73d59314e6ed268d6f322ae1bdd723b23fa5a4ed.tar.gz linux-3.10-73d59314e6ed268d6f322ae1bdd723b23fa5a4ed.tar.bz2 linux-3.10-73d59314e6ed268d6f322ae1bdd723b23fa5a4ed.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (864 commits)
Btrfs: explicitly mark the tree log root for writeback
Btrfs: Drop the hardware crc32c asm code
Btrfs: Add Documentation/filesystem/btrfs.txt, remove old COPYING
Btrfs: kmap_atomic(KM_USER0) is safe for btrfs_readpage_end_io_hook
Btrfs: Don't use kmap_atomic(..., KM_IRQ0) during checksum verifies
Btrfs: tree logging checksum fixes
Btrfs: don't change file extent's ram_bytes in btrfs_drop_extents
Btrfs: Use btrfs_join_transaction to avoid deadlocks during snapshot creation
Btrfs: drop remaining LINUX_KERNEL_VERSION checks and compat code
Btrfs: drop EXPORT symbols from extent_io.c
Btrfs: Fix checkpatch.pl warnings
Btrfs: Fix free block discard calls down to the block layer
Btrfs: avoid orphan inode caused by log replay
Btrfs: avoid potential super block corruption
Btrfs: do not call kfree if kmalloc failed in btrfs_sysfs_add_super
Btrfs: fix a memory leak in btrfs_get_sb
Btrfs: Fix typo in clear_state_cb
Btrfs: Fix memset length in btrfs_file_write
Btrfs: update directory's size when creating subvol/snapshot
Btrfs: add permission checks to the ioctls
...
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 32883589ee5..02cff86af1b 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -269,6 +269,25 @@ config OCFS2_FS_POSIX_ACL Posix Access Control Lists (ACLs) support permissions for users and groups beyond the owner/group/world scheme. +config BTRFS_FS + tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format" + depends on EXPERIMENTAL + select LIBCRC32C + select ZLIB_INFLATE + select ZLIB_DEFLATE + help + Btrfs is a new filesystem with extents, writable snapshotting, + support for multiple devices and many more features. + + Btrfs is highly experimental, and THE DISK FORMAT IS NOT YET + FINALIZED. You should say N here unless you are interested in + testing Btrfs with non-critical data. + + To compile this file system support as a module, choose M here. The + module will be called btrfs. + + If unsure, say N. + endif # BLOCK source "fs/notify/Kconfig" |