move d_rcu from overlapping d_child to overlapping d_alias

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

2 files changed, 5 insertions, 5 deletions

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index e6d63f8f98c0..695e7888fef8 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -111,7 +111,7 @@ static int fpos_cmp(loff_t l, loff_t r)
 /*
  * When possible, we try to satisfy a readdir by peeking at the
  * dcache.  We make this work by carefully ordering dentries on
- * d_u.d_child when we initially get results back from the MDS, and
+ * d_child when we initially get results back from the MDS, and
  * falling back to a "normal" sync readdir if any dentries in the dir
  * are dropped.
  *
@@ -147,11 +147,11 @@ static int __dcache_readdir(struct file *file,  struct dir_context *ctx,
                 p = parent->d_subdirs.prev;
                 dout(" initial p %p/%p\n", p->prev, p->next);
         } else {
-                p = last->d_u.d_child.prev;
+                p = last->d_child.prev;
         }
 
 more:
-        dentry = list_entry(p, struct dentry, d_u.d_child);
+        dentry = list_entry(p, struct dentry, d_child);
         di = ceph_dentry(dentry);
         while (1) {
                 dout(" p %p/%p %s d_subdirs %p/%p\n", p->prev, p->next,
@@ -174,7 +174,7 @@ more:
                      !dentry->d_inode ? " null" : "");
                 spin_unlock(&dentry->d_lock);
                 p = p->prev;
-                dentry = list_entry(p, struct dentry, d_u.d_child);
+                dentry = list_entry(p, struct dentry, d_child);
                 di = ceph_dentry(dentry);
         }
 
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 7b6139004401..7a1df90c7771 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1399,7 +1399,7 @@ retry_lookup:
                         /* reorder parent's d_subdirs */
                         spin_lock(&parent->d_lock);
                         spin_lock_nested(&dn->d_lock, DENTRY_D_LOCK_NESTED);
-                        list_move(&dn->d_u.d_child, &parent->d_subdirs);
+                        list_move(&dn->d_child, &parent->d_subdirs);
                         spin_unlock(&dn->d_lock);
                         spin_unlock(&parent->d_lock);
                 }