---

yaml --- r: 128951 b: refs/heads/master c: 60582d1 h: refs/heads/master i: 128949: e17a923 128947: d24be1f 128943: 04ca74b v: v3
git-mirror · Sep 25, 2008 · f1d6070 · f1d6070
1 parent 8bcc594
commit f1d6070
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4f6c45dfbf84f47c21f73f6370ad1292b0627fd
+refs/heads/master: 60582d1e933649f14f46f816bb75049058679e01
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
@@ -497,6 +497,23 @@ config OCFS2_DEBUG_FS
 	  this option for debugging only as it is likely to decrease
 	  performance of the filesystem.
 
+config BTRFS_FS
+	tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
+	depends on EXPERIMENTAL
+	select LIBCRC32C
+	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
 
 config DNOTIFY

diff --git a/trunk/fs/Makefile b/trunk/fs/Makefile
@@ -121,4 +121,5 @@ obj-$(CONFIG_HOSTFS)		+= hostfs/
 obj-$(CONFIG_HPPFS)		+= hppfs/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
 obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
+obj-$(CONFIG_BTRFS_FS)		+= btrfs/
 obj-$(CONFIG_GFS2_FS)           += gfs2/