aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/Kconfig17
-rw-r--r--fs/Makefile1
2 files changed, 18 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index abccb5dab9a8..18f5a85b47c6 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -497,6 +497,23 @@ config OCFS2_DEBUG_FS
497 this option for debugging only as it is likely to decrease 497 this option for debugging only as it is likely to decrease
498 performance of the filesystem. 498 performance of the filesystem.
499 499
500config BTRFS_FS
501 tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
502 depends on EXPERIMENTAL
503 select LIBCRC32C
504 help
505 Btrfs is a new filesystem with extents, writable snapshotting,
506 support for multiple devices and many more features.
507
508 Btrfs is highly experimental, and THE DISK FORMAT IS NOT YET
509 FINALIZED. You should say N here unless you are interested in
510 testing Btrfs with non-critical data.
511
512 To compile this file system support as a module, choose M here. The
513 module will be called btrfs.
514
515 If unsure, say N.
516
500endif # BLOCK 517endif # BLOCK
501 518
502config DNOTIFY 519config DNOTIFY
diff --git a/fs/Makefile b/fs/Makefile
index a1482a5eff15..41fcc858c972 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -121,4 +121,5 @@ obj-$(CONFIG_HOSTFS) += hostfs/
121obj-$(CONFIG_HPPFS) += hppfs/ 121obj-$(CONFIG_HPPFS) += hppfs/
122obj-$(CONFIG_DEBUG_FS) += debugfs/ 122obj-$(CONFIG_DEBUG_FS) += debugfs/
123obj-$(CONFIG_OCFS2_FS) += ocfs2/ 123obj-$(CONFIG_OCFS2_FS) += ocfs2/
124obj-$(CONFIG_BTRFS_FS) += btrfs/
124obj-$(CONFIG_GFS2_FS) += gfs2/ 125obj-$(CONFIG_GFS2_FS) += gfs2/