Hi, it would be cool if the attached patch could
be merged into aufs. It renames si_flags to aufs_si_flags, see below.
Quoting dann frazier:
"
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
Regards,
Julian Andres Klode
--- fs/aufs/module.c 2007-09-24 11:08:02.000000000 -0600
+++ 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),
--- fs/aufs/super.c 2007-09-24 11:08:02.000000000 -0600
+++ 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;
--- fs/aufs/super.h 2007-09-24 11:08:02.000000000 -0600
+++ 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)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
