File aufs-si_flags-rename.diff of Package aufs

Overview Repositories Revisions Requests Users Attributes Meta

File aufs-si_flags-rename.diff of Package aufs

From: Jeff Mahoney <jeffm@suse.com>
Subject: [PATCH] aufs: rename si_flags

si_flags is used as a #define in the signal handling code of ia64. The
 conflict caused build failures as it was expanding si_flags into
 _sifields._sigfault._flags

This patch renames it to avoid the conflict.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>

---

fs/aufs/module.c |    2 +-
 fs/aufs/super.c  |    2 +-
 fs/aufs/super.h  |    8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff -rup aufs/fs/aufs/module.c aufs.devel/fs/aufs/module.c
--- aufs/fs/aufs/module.c	2007-06-04 04:17:35.000000000 +0200
+++ aufs.devel/fs/aufs/module.c	2007-06-05 21:05:50.656153000 +0200
@@ -181,7 +181,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), si_sflags),
 		       offsetof(typeof(*u.si), si_xino),
 		       offsetof(typeof(*u.si), si_rdcache),
 		       offsetof(typeof(*u.si), si_dirwh),
diff -rup aufs/fs/aufs/super.c aufs.devel/fs/aufs/super.c
--- aufs/fs/aufs/super.c	2007-06-04 04:17:35.000000000 +0200
+++ aufs.devel/fs/aufs/super.c	2007-06-05 21:05:30.904929000 +0200
@@ -586,7 +586,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->si_sflags = AuDefFlags;
 	atomic_long_set(&sbinfo->si_xino, AUFS_FIRST_INO);
 #if 0
 	sbinfo->si_wkq = create_workqueue(AUFS_WKQ_NAME);
diff -rup aufs/fs/aufs/super.h aufs.devel/fs/aufs/super.h
--- aufs/fs/aufs/super.h	2007-06-04 04:17:35.000000000 +0200
+++ aufs.devel/fs/aufs/super.h	2007-06-05 21:05:43.035780000 +0200
@@ -61,7 +61,7 @@ struct aufs_sbinfo {
 	struct aufs_branch	**si_branch;
 
 	/* mount flags */
-	unsigned int		si_flags;
+	unsigned int		si_sflags;
 
 	/* external inode number table */
 	atomic_long_t		si_xino;	// time bomb
@@ -299,20 +299,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)->si_sflags |= flag;
 }
 
 static inline void au_flag_clr(struct super_block *sb, unsigned int flag)
 {
 	//SiMustWriteLock(sb);
-	stosi(sb)->si_flags &= ~flag;
+	stosi(sb)->si_sflags &= ~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)->si_sflags & flag;
 }
 
 static inline unsigned int au_flag_test_udba(struct super_block *sb)

Places

File aufs-si_flags-rename.diff of Package aufs

Places