diff -aur unionfs14+debian/Makefile unionfs14/Makefile
--- unionfs14+debian/Makefile	2006-11-04 23:56:59.000000000 +0000
+++ unionfs14/Makefile	2010-03-10 23:15:31.000000000 +0000
@@ -4,13 +4,14 @@
 SUP_PATCH= 18
 
 EXTRA_CFLAGS+=-DUNIONFS_VERSION=\"${UNIONFS_VERSION}\" -DSUP_MAJOR=${SUP_MAJOR} -DSUP_MINOR=${SUP_MINOR} -DSUP_PATCH=${SUP_PATCH}
+EXTRA_CFLAGS+=-DUNIONFS_UNSUPPORTED
 
 # This will enable full debugging support
 # EXTRA_CFLAGS+=-DUNIONFS_DEBUG
 
-obj-$(CONFIG_UNION_FS) += unionfs.o
+obj-$(CONFIG_UNION_FS) += unionfs14.o
 
-unionfs-objs := subr.o dentry.o file.o inode.o main.o super.o \
+unionfs14-objs := subr.o dentry.o file.o inode.o main.o super.o \
 	stale_inode.o branchman.o xattr.o rdstate.o copyup.o  \
 	dirhelper.o rename.o unlink.o lookup.o persistent_inode.o \
 	commonfops.o dirfops.o print.o sioq.o
diff -aur unionfs14+debian/dirfops.c unionfs14/dirfops.c
--- unionfs14+debian/dirfops.c	2006-11-04 23:56:59.000000000 +0000
+++ unionfs14/dirfops.c	2010-03-10 23:48:25.000000000 +0000
@@ -41,7 +41,7 @@
 
 /* copied from generic filldir in fs/readir.c */
 static int unionfs_filldir(void *dirent, const char *name, int namelen,
-			   loff_t offset, ino_t ino, unsigned int d_type)
+			   loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct unionfs_getdents_callback *buf =
 	    (struct unionfs_getdents_callback *)dirent;
diff -aur unionfs14+debian/dirhelper.c unionfs14/dirhelper.c
--- unionfs14+debian/dirhelper.c	2006-11-04 23:56:59.000000000 +0000
+++ unionfs14/dirhelper.c	2010-03-10 23:48:41.000000000 +0000
@@ -155,7 +155,7 @@
 
 /* This filldir function makes sure only whiteouts exist within a directory. */
 static int readdir_util_callback(void *dirent, const char *name, int namelen,
-				 loff_t offset, ino_t ino, unsigned int d_type)
+				 loff_t offset, u64 ino, unsigned int d_type)
 {
 	int err = 0;
 	struct unionfs_rdutil_callback *buf =
diff -aur unionfs14+debian/super.c unionfs14/super.c
--- unionfs14+debian/super.c	2010-03-11 00:22:33.000000000 +0000
+++ unionfs14/super.c	2010-03-10 23:13:49.000000000 +0000
@@ -352,8 +352,10 @@
 
 	print_entry_location();
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22))
 	if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) ==
 	    SLAB_CTOR_CONSTRUCTOR)
+#endif
 		inode_init_once(&c->vfs_inode);
 
 	print_exit_location();
diff -aur unionfs14+debian/unionfs.h unionfs14/unionfs.h
--- unionfs14+debian/unionfs.h	2010-03-11 00:22:33.000000000 +0000
+++ unionfs14/unionfs.h	2010-03-10 23:41:17.000000000 +0000
@@ -36,6 +36,7 @@
 #include <linux/security.h>
 #include <linux/spinlock.h>
 #include <linux/compat.h>
+#include <linux/types.h>
 
 #include <linux/swap.h>