Btrfs: Fix infinite loop in btrfs_extent_post_op

[safe/jmp/linux-2.6] / fs / btrfs / Makefile

diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index 3a01065..d2cf5a5 100644 (file)
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -1,30 +1,25 @@
 ifneq ($(KERNELRELEASE),)
 # kbuild part of makefile
 
-obj-m  := btrfs.o
+obj-$(CONFIG_BTRFS_FS) := btrfs.o
 btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
           file-item.o inode-item.o inode-map.o disk-io.o \
-          transaction.o bit-radix.o inode.o file.o tree-defrag.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 acl.o export.o
-
+          ref-cache.o export.o tree-log.o acl.o free-space-cache.o zlib.o \
+          compression.o
 else
 
 # Normal Makefile
 
 KERNELDIR := /lib/modules/`uname -r`/build
-all: version
-       $(MAKE) -C $(KERNELDIR) M=`pwd` modules
-
-version:
-       bash version.sh
+all:
+       $(MAKE) -C $(KERNELDIR) M=`pwd` CONFIG_BTRFS_FS=m modules
 
 modules_install:
        $(MAKE) -C $(KERNELDIR) M=`pwd` modules_install
 clean:
        $(MAKE) -C $(KERNELDIR) M=`pwd` clean
 
-tester:
-       $(MAKE) -C $(KERNELDIR) M=`pwd` tree-defrag.o transaction.o sysfs.o super.o root-tree.o inode-map.o inode-item.o inode.o file-item.o file.o extent_map.o disk-io.o ctree.o dir-item.o extent-tree.o
 endif