move d_rcu from overlapping d_child to overlapping d_alias

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 7 insertions, 7 deletions

diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 683a5b9ce22a..dcdec6fd33c6 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -85,7 +85,7 @@ static struct dentry *get_next_positive_subdir(struct dentry *prev,
         spin_lock(&root->d_lock);
 
         if (prev)
-                next = prev->d_u.d_child.next;
+                next = prev->d_child.next;
         else {
                 prev = dget_dlock(root);
                 next = prev->d_subdirs.next;
@@ -99,13 +99,13 @@ cont:
                 return NULL;
         }
 
-        q = list_entry(next, struct dentry, d_u.d_child);
+        q = list_entry(next, struct dentry, d_child);
 
         spin_lock_nested(&q->d_lock, DENTRY_D_LOCK_NESTED);
         /* Already gone or negative dentry (under construction) - try next */
         if (!d_count(q) || !simple_positive(q)) {
                 spin_unlock(&q->d_lock);
-                next = q->d_u.d_child.next;
+                next = q->d_child.next;
                 goto cont;
         }
         dget_dlock(q);
@@ -155,13 +155,13 @@ again:
                                 goto relock;
                         }
                         spin_unlock(&p->d_lock);
-                        next = p->d_u.d_child.next;
+                        next = p->d_child.next;
                         p = parent;
                         if (next != &parent->d_subdirs)
                                 break;
                 }
         }
-        ret = list_entry(next, struct dentry, d_u.d_child);
+        ret = list_entry(next, struct dentry, d_child);
 
         spin_lock_nested(&ret->d_lock, DENTRY_D_LOCK_NESTED);
         /* Negative dentry - try next */
@@ -489,7 +489,7 @@ found:
         spin_lock(&sbi->lookup_lock);
         spin_lock(&expired->d_parent->d_lock);
         spin_lock_nested(&expired->d_lock, DENTRY_D_LOCK_NESTED);
-        list_move(&expired->d_parent->d_subdirs, &expired->d_u.d_child);
+        list_move(&expired->d_parent->d_subdirs, &expired->d_child);
         spin_unlock(&expired->d_lock);
         spin_unlock(&expired->d_parent->d_lock);
         spin_unlock(&sbi->lookup_lock);
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index d76d083f2f06..0822c9eacc56 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -687,7 +687,7 @@ static void autofs_clear_leaf_automount_flags(struct dentry *dentry)
         /* only consider parents below dentrys in the root */
         if (IS_ROOT(parent->d_parent))
                 return;
-        d_child = &dentry->d_u.d_child;
+        d_child = &dentry->d_child;
         /* Set parent managed if it's becoming empty */
         if (d_child->next == &parent->d_subdirs &&
             d_child->prev == &parent->d_subdirs)