Merge branch 'aufs5.x-rcN/00base' into aufs5.x-rcN/01modular

fs/aufs/dynop.c

@@ -341,9 +341,6 @@ void __init au_dy_init(void)
 {
 	int i;
 
-	/* make sure that 'struct au_dykey *' can be any type */
-	BUILD_BUG_ON(offsetof(struct au_dyaop, da_key));
-
 	for (i = 0; i < AuDyLast; i++)
 		INIT_HLIST_BL_HEAD(dynop + i);
 }

fs/aufs/dynop.h

@@ -44,6 +44,8 @@ struct au_dyaop {
 	struct au_dykey			da_key;
 	struct address_space_operations	da_op; /* not const */
 };
+/* make sure that 'struct au_dykey *' can be any type */
+static_assert(!offsetof(struct au_dyaop, da_key));
 
 /* ---------------------------------------------------------------------- */
 

fs/aufs/hnotify.c

@@ -572,7 +572,7 @@ int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask,
 		flags[AuHn_CHILD] = AuHnJob_ISDIR;
 	au_fset_hnjob(flags[AuHn_PARENT], DIRENT);
 	au_fset_hnjob(flags[AuHn_CHILD], GEN);
-	switch (mask & FS_EVENTS_POSS_ON_CHILD) {
+	switch (mask & ALL_FSNOTIFY_DIRENT_EVENTS) {
 	case FS_MOVED_FROM:
 	case FS_MOVED_TO:
 		au_fset_hnjob(flags[AuHn_CHILD], XINO0);

fs/aufs/loop.c

@@ -116,7 +116,7 @@ int au_loopback_init(void)
 	int err;
 	struct super_block *sb __maybe_unused;
 
-	BUILD_BUG_ON(sizeof(sb->s_magic) != sizeof(unsigned long));
+	BUILD_BUG_ON(sizeof(sb->s_magic) != sizeof(*au_warn_loopback_array));
 
 	err = 0;
 	au_warn_loopback_array = kcalloc(au_warn_loopback_step,

fs/aufs/super.h

@@ -425,7 +425,7 @@ static inline void dbgaufs_si_null(struct au_sbinfo *sbinfo)
 
 /* current->atomic_flags */
 /* this value should never corrupt the ones defined in linux/sched.h */
-#define PFA_AUFS	7
+#define PFA_AUFS	0x10
 
 TASK_PFA_TEST(AUFS, test_aufs)	/* task_test_aufs */
 TASK_PFA_SET(AUFS, aufs)	/* task_set_aufs */