Actually, the problem is a namespace collision with some arch/ia64
code. si_flags is a macro defined in include/asm-ia64/siginfo.h. I've
uploaded an NMU that changes the name of the field to
aufs_si_flags. Patch attached.

-- 
dann frazier

diff -u aufs-0+20070924/debian/changelog aufs-0+20070924/debian/changelog
--- aufs-0+20070924/debian/changelog
+++ aufs-0+20070924/debian/changelog
@@ -1,3 +1,10 @@
+aufs (0+20070924-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix namespace collision that resulted in a FTBFS on ia64
+
+ -- dann frazier <[EMAIL PROTECTED]>  Thu, 27 Sep 2007 13:39:49 -0600
+
 aufs (0+20070924-1) unstable; urgency=low
 
   * New upstream snapshot
only in patch2:
unchanged:
--- aufs-0+20070924.orig/debian/patches/03_fix_ftbfs_on_ia64.dpatch
+++ aufs-0+20070924/debian/patches/03_fix_ftbfs_on_ia64.dpatch
@@ -0,0 +1,68 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix_ftbfs.dpatch by  <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+
+diff -urpN /usr/src/modules/aufs/module.c aufs-0+20070924/fs/aufs/module.c
+--- /usr/src/modules/aufs/module.c	2007-09-24 11:08:02.000000000 -0600
++++ aufs-0+20070924/fs/aufs/module.c	2007-09-27 13:24:49.000000000 -0600
+@@ -209,7 +209,7 @@ static int __init aufs_init(void)
+ 		       offsetof(typeof(*u.si), si_bend),
+ 		       offsetof(typeof(*u.si), si_last_br_id),
+ 		       offsetof(typeof(*u.si), si_branch),
+-		       offsetof(typeof(*u.si), si_flags),
++		       offsetof(typeof(*u.si), aufs_si_flags),
+ 		       offsetof(typeof(*u.si), si_xino),
+ 		       offsetof(typeof(*u.si), si_rdcache),
+ 		       offsetof(typeof(*u.si), si_dirwh),
+diff -urpN /usr/src/modules/aufs/super.c aufs-0+20070924/fs/aufs/super.c
+--- /usr/src/modules/aufs/super.c	2007-09-24 11:08:02.000000000 -0600
++++ aufs-0+20070924/fs/aufs/super.c	2007-09-27 13:24:34.000000000 -0600
+@@ -713,7 +713,7 @@ static int alloc_sbinfo(struct super_blo
+ 	sbinfo->si_failed_refresh_dirs = 0;
+ 	sbinfo->si_bend = -1;
+ 	sbinfo->si_last_br_id = 0;
+-	sbinfo->si_flags = AuDefFlags;
++	sbinfo->aufs_si_flags = AuDefFlags;
+ 
+ 	sbinfo->si_xread = NULL;
+ 	sbinfo->si_xwrite = NULL;
+diff -urpN /usr/src/modules/aufs/super.h aufs-0+20070924/fs/aufs/super.h
+--- /usr/src/modules/aufs/super.h	2007-09-24 11:08:02.000000000 -0600
++++ aufs-0+20070924/fs/aufs/super.h	2007-09-27 13:24:16.000000000 -0600
+@@ -73,7 +73,7 @@ struct aufs_sbinfo {
+ 	struct aufs_branch	**si_branch;
+ 
+ 	/* mount flags */
+-	unsigned int		si_flags;
++	unsigned int		aufs_si_flags;
+ 
+ 	/* external inode number (bitmap and translation table) */
+ 	readf_t			si_xread;
+@@ -344,20 +344,20 @@ static inline void au_mntput(struct supe
+ static inline void au_flag_set(struct super_block *sb, unsigned int flag)
+ {
+ 	//SiMustWriteLock(sb);
+-	stosi(sb)->si_flags |= flag;
++	stosi(sb)->aufs_si_flags |= flag;
+ }
+ 
+ static inline void au_flag_clr(struct super_block *sb, unsigned int flag)
+ {
+ 	//SiMustWriteLock(sb);
+-	stosi(sb)->si_flags &= ~flag;
++	stosi(sb)->aufs_si_flags &= ~flag;
+ }
+ 
+ static inline
+ unsigned int au_flag_test(struct super_block *sb, unsigned int flag)
+ {
+ 	//SiMustAnyLock(sb);
+-	return stosi(sb)->si_flags & flag;
++	return stosi(sb)->aufs_si_flags & flag;
+ }
+ 
+ static inline unsigned int au_flag_test_udba(struct super_block *sb)

Reply via email to