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 dfbde56e048671f47b4dcc15535534c79fde5276..200b66a3bad436a30380ad7f6f100f52251bdf91 100644 (file)
--- a/fs/unionfs/Makefile
+++ b/fs/unionfs/Makefile
@@ -1,3 +1,7 @@
+UNIONFS_VERSION="2.1-odf (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 f311d033f26dadbc81e5f6bf387ae4436f9fa6c1..be4031af82a2c2b927895948ac6f3cc61b3e19bd 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:
  */