From: Chris Mason <chris.mason@oracle.com>
Date: Wed, 19 Nov 2008 20:59:28 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs... 
X-Git-Tag: v2.6.29-rc1~27^2~9^2~55
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ae20a6afec1cf21919d97303f2d8b737eac5acc7;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
---

ae20a6afec1cf21919d97303f2d8b737eac5acc7
diff --cc fs/Kconfig
index 522469a7eca,31cce5d88b1..5f62e7e0e6c
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@@ -258,16 -497,25 +258,35 @@@ config OCFS2_DEBUG_F
  	  this option for debugging only as it is likely to decrease
  	  performance of the filesystem.
  
 +config OCFS2_COMPAT_JBD
 +	bool "Use JBD for compatibility"
 +	depends on OCFS2_FS
 +	default n
 +	select JBD
 +	help
 +	  The ocfs2 filesystem now uses JBD2 for its journalling.  JBD2
 +	  is backwards compatible with JBD.  It is safe to say N here.
 +	  However, if you really want to use the original JBD, say Y here.
 +
+ config BTRFS_FS
+ 	tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
+ 	depends on EXPERIMENTAL
+ 	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.
+ 
+ 	  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