Unionfs: support incremental versions

Also: release Unionfs 2.1 (since code has gotten much more stable since 2.0)

Unionfs will now report its precise version number and the kernel it was
meant for, upon module loading.  This is useful for maintenance purposes:
users can report the precise release number of Unionfs, and it also helps
prevent running older versions when newer ones are intended, or mixing
versions among supported kernels.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/Makefile b/fs/unionfs/Makefile
index 7c18a3c25754d3fe7ab5b1bd06dcf66c170b3742..9bb88f46afb948c50381b0787cb896d5314d35b0 100644 (file)
--- a/fs/unionfs/Makefile
+++ b/fs/unionfs/Makefile
@@ -1,3 +1,7 @@
+UNIONFS_VERSION="2.1 (for 2.6.23-rc1)"
+
+EXTRA_CFLAGS += -DUNIONFS_VERSION=\"$(UNIONFS_VERSION)\"
+
 obj-$(CONFIG_UNION_FS) += unionfs.o
 
 unionfs-y := subr.o dentry.o file.o inode.o main.o super.o \

diff --git a/include/linux/union_fs.h b/include/linux/union_fs.h
index 9bc4e3b644f01e96834a11ae49331c51942ef025..d13eb48e269a61bd1ddaae0abc5f1220b7c61690 100644 (file)
--- a/include/linux/union_fs.h
+++ b/include/linux/union_fs.h
@@ -12,7 +12,6 @@
 #ifndef _LINUX_UNION_FS_H
 #define _LINUX_UNION_FS_H
 
-#define UNIONFS_VERSION  "2.0"
 /*
  * DEFINITIONS FOR USER AND KERNEL CODE:
  */