---

yaml --- r: 128981 b: refs/heads/master c: c8b9781 h: refs/heads/master i: 128979: 96ac05e v: v3
git-mirror · Oct 29, 2008 · acb1ba4 · acb1ba4
1 parent 4b90e4e
commit acb1ba4
Show file tree

Hide file tree

Showing 23 changed files with 2,316 additions and 380 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26ce34a9c47334ff7984769e4661b2f1883594ff
+refs/heads/master: c8b978188c9a0fd3d535c13debd19d522b726f1f
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
@@ -501,6 +501,8 @@ 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.

diff --git a/trunk/fs/btrfs/Makefile b/trunk/fs/btrfs/Makefile
@@ -7,7 +7,8 @@ btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
 	   transaction.o inode.o file.o tree-defrag.o \
 	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \
 	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \
-	   ref-cache.o export.o tree-log.o acl.o free-space-cache.o
+	   ref-cache.o export.o tree-log.o acl.o free-space-cache.o zlib.o \
+	   compression.o
 else
 
 # Normal Makefile