summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-09-24 17:05:53 +0200
committerChris Mason <chris.mason@oracle.com>2008-09-25 21:41:59 +0200
commitb4f6c45dfbf84f47c21f73f6370ad1292b0627fd (patch)
treea85c3a7b304e768f1f3321f39d0ae6c4402cc1ee /fs
parentMerge Btrfs into fs/btrfs (diff)
downloadlinux-b4f6c45dfbf84f47c21f73f6370ad1292b0627fd.tar.xz
linux-b4f6c45dfbf84f47c21f73f6370ad1292b0627fd.zip
Update Btrfs files for in-kernel usage
btrfs had magic to put the chagneset id into a printk on module load. This removes that from the Makefile and hardcodes the printk to print "Btrfs" Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/Makefile7
-rw-r--r--fs/btrfs/version.h4
2 files changed, 5 insertions, 6 deletions
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index eb36ae981bdc..d5c28557fba9 100644
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -13,17 +13,12 @@ else
# Normal Makefile
KERNELDIR := /lib/modules/`uname -r`/build
-all: version
+all:
$(MAKE) -C $(KERNELDIR) M=`pwd` modules
-version:
- bash version.sh
-
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
diff --git a/fs/btrfs/version.h b/fs/btrfs/version.h
new file mode 100644
index 000000000000..9bf3946d5ef2
--- /dev/null
+++ b/fs/btrfs/version.h
@@ -0,0 +1,4 @@
+#ifndef __BTRFS_VERSION_H
+#define __BTRFS_VERSION_H
+#define BTRFS_BUILD_VERSION "Btrfs"
+#endif