diff -Naur aufs3.16/fs/aufs/debug.c aufs3.16-patched/fs/aufs/debug.c
--- aufs3.16/fs/aufs/debug.c    2017-04-16 11:54:45.253840000 +0800
+++ aufs3.16-patched/fs/aufs/debug.c    2017-04-16 11:55:44.743843000 +0800
@@ -168,7 +168,7 @@
    struct dentry *d;

    spin_lock(&inode->i_lock);
-   hlist_for_each_entry(d, &inode->i_dentry, d_alias)
+   hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias)
        au_dpri_dentry(d);
    spin_unlock(&inode->i_lock);
 }
diff -Naur aufs3.16/fs/aufs/export.c aufs3.16-patched/fs/aufs/export.c
--- aufs3.16/fs/aufs/export.c   2017-04-16 11:54:45.267174000 +0800
+++ aufs3.16-patched/fs/aufs/export.c   2017-04-16 11:55:44.750510000 +0800
@@ -243,7 +243,7 @@
        dentry = d_find_alias(inode);
    else {
        spin_lock(&inode->i_lock);
-       hlist_for_each_entry(d, &inode->i_dentry, d_alias) {
+       hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias) {
            spin_lock(&d->d_lock);
            if (!au_test_anon(d)
                && d->d_parent->d_inode->i_ino == dir_ino) {
diff -Naur aufs3.16/fs/aufs/hnotify.c aufs3.16-patched/fs/aufs/hnotify.c
--- aufs3.16/fs/aufs/hnotify.c  2017-04-16 11:54:45.297174000 +0800
+++ aufs3.16-patched/fs/aufs/hnotify.c  2017-04-16 11:55:44.750510000 +0800
@@ -211,7 +211,7 @@
        AuDebugOn(!name);
        au_iigen_dec(inode);
        spin_lock(&inode->i_lock);
-       hlist_for_each_entry(d, &inode->i_dentry, d_alias) {
+       hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias) {
            spin_lock(&d->d_lock);
            dname = &d->d_name;
            if (dname->len != nlen
@@ -378,7 +378,7 @@

    dentry = NULL;
    spin_lock(&parent->d_lock);
-   list_for_each_entry(d, &parent->d_subdirs, d_u.d_child) {
+   list_for_each_entry(d, &parent->d_subdirs, d_child) {
        /* AuDbg("%pd\n", d); */
        spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED);
        dname = &d->d_name;