From f1d6070af0105aff67fa25ef88f4e7c2703e516e Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Thu, 25 Sep 2008 12:25:16 -0400 Subject: [PATCH] --- yaml --- r: 128951 b: refs/heads/master c: 60582d1e933649f14f46f816bb75049058679e01 h: refs/heads/master i: 128949: e17a9236d16bb4996f7bbc39669bfe3fa68e5cfc 128947: d24be1f038045c8107710565e55c6c0be2f8e345 128943: 04ca74bb294aa14f46ffc83cfd40e56a5b5c6a1d v: v3 --- [refs] | 2 +- trunk/fs/Kconfig | 17 +++++++++++++++++ trunk/fs/Makefile | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ea2969aa8c06..3a6994453cb2 100644 --- 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 index abccb5dab9a8..18f5a85b47c6 100644 --- 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 index a1482a5eff15..41fcc858c972 100644 --- 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/