diff mbox

[MeeGo-dev] Btrfs as default file system

Message ID alpine.DEB.2.01.1005140634170.12512@bogon.housecafe.de (mailing list archive)
State New, archived
Headers show

Commit Message

Christian Kujau May 14, 2010, 1:47 p.m. UTC
None
diff mbox

Patch

diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt
index 64087c3..da67070 100644
--- a/Documentation/filesystems/btrfs.txt
+++ b/Documentation/filesystems/btrfs.txt
@@ -12,9 +12,9 @@  number of challenges with scaling to the large storage subsystems that
 are becoming common in today's data centers. Filesystems need to scale
 in their ability to address and manage large storage, and also in
 their ability to detect, repair and tolerate errors in the data stored
-on disk.  Btrfs is under heavy development, and is not suitable for
-any uses other than benchmarking and review. The Btrfs disk format is
-not yet finalized.
+on disk.  Btrfs is under heavy development, but with Linux 2.6.31 the
+Btrfs disk format has been finalized and is not considered experimental
+any more.
 
 The main Btrfs features include:
 
@@ -33,6 +33,7 @@  The main Btrfs features include:
     * Efficient incremental backup and FS mirroring (not yet implemented)
     * Online filesystem defragmentation
 
+Please see https://btrfs.wiki.kernel.org for details on these features.
 
 
 	MAILING LIST
diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig
index 7bb3c02..cebb197 100644
--- a/fs/btrfs/Kconfig
+++ b/fs/btrfs/Kconfig
@@ -1,16 +1,12 @@ 
 config BTRFS_FS
-	tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
-	depends on EXPERIMENTAL
+	tristate "Btrfs filesystem"
 	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.
+	  support for multiple devices and many more features. For more
+	  information, please see https://btrfs.wiki.kernel.org.
 
 	  To compile this file system support as a module, choose M here. The
 	  module will be called btrfs.