Merge branch 'aufs5.9/00base' into aufs5.9/01modular

fs/aufs/hfsnotify.c

@@ -147,8 +147,8 @@ static void au_hfsn_free_group(struct fsnotify_group *group)
 }
 
 static int au_hfsn_handle_event(struct fsnotify_group *group,
-				struct inode *inode,
 				u32 mask, const void *data, int data_type,
+				struct inode *dir,
 				const struct qstr *file_name, u32 cookie,
 				struct fsnotify_iter_info *iter_info)
 {
@@ -165,7 +165,7 @@ static int au_hfsn_handle_event(struct fsnotify_group *group,
 	if (mask & (FS_IN_IGNORED | FS_UNMOUNT))
 		goto out;
 
-	h_dir = inode;
+	h_dir = dir;
 	h_inode = NULL;
 #ifdef AuDbgHnotify
 	au_debug_on();

include/uapi/linux/aufs_type.h

@@ -27,7 +27,7 @@
 #include <limits.h>
 #endif /* __KERNEL__ */
 
-#define AUFS_VERSION	"5.8"
+#define AUFS_VERSION	"5.9"
 
 /* todo? move this to linux-2.6.19/include/magic.h */
 #define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')