1 files changed, 24 insertions, 2 deletions

diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig
index d33f01c08b60..2b3b83296977 100644
--- a/fs/btrfs/Kconfig
+++ b/fs/btrfs/Kconfig
@@ -1,11 +1,13 @@
 config BTRFS_FS
-        tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
-        depends on EXPERIMENTAL
+        tristate "Btrfs filesystem support"
         select LIBCRC32C
         select ZLIB_INFLATE
         select ZLIB_DEFLATE
         select LZO_COMPRESS
         select LZO_DECOMPRESS
+        select RAID6_PQ
+        select XOR_BLOCKS
+
         help
           Btrfs is a new filesystem with extents, writable snapshotting,
           support for multiple devices and many more features.
@@ -50,3 +52,23 @@ config BTRFS_FS_CHECK_INTEGRITY
           In most cases, unless you are a btrfs developer who needs
           to verify the integrity of (super)-block write requests
           during the run of a regression test, say N
+
+config BTRFS_FS_RUN_SANITY_TESTS
+        bool "Btrfs will run sanity tests upon loading"
+        depends on BTRFS_FS
+        help
+          This will run some basic sanity tests on the free space cache
+          code to make sure it is acting as it should.  These are mostly
+          regression tests and are only really interesting to btrfs devlopers.
+
+          If unsure, say N.
+
+config BTRFS_DEBUG
+        bool "Btrfs debugging support"
+        depends on BTRFS_FS
+        help
+          Enable run-time debugging support for the btrfs filesystem. This may
+          enable additional and expensive checks with negative impact on
+          performance, or export extra information via sysfs.
+
+          If unsure, say N.